From 036e0575283549a96ba205b8c7130bfee2f11343 Mon Sep 17 00:00:00 2001
From: Elliot Jordan <elliot@elliotjordan.com>
Date: Tue, 30 Jul 2019 13:17:59 -0700
Subject: [PATCH 1/6] Update to "macOS" where needed

---
 .../Base.lproj/LGNotificationsViewController.xib          | 2 +-
 .../en.lproj/LGNotificationsViewController.strings        | 4 ++--
 .../es.lproj/LGNotificationsViewController.strings        | 4 ++--
 .../fr.lproj/LGNotificationsViewController.strings        | 4 ++--
 CHANGELOG.md                                              | 8 +++++++-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/AutoPkgr/Views-Controllers-XIB/Tab Views/Base.lproj/LGNotificationsViewController.xib b/AutoPkgr/Views-Controllers-XIB/Tab Views/Base.lproj/LGNotificationsViewController.xib
index 06672d6f..57db5743 100644
--- a/AutoPkgr/Views-Controllers-XIB/Tab Views/Base.lproj/LGNotificationsViewController.xib	
+++ b/AutoPkgr/Views-Controllers-XIB/Tab Views/Base.lproj/LGNotificationsViewController.xib	
@@ -365,7 +365,7 @@
                     <constraints>
                         <constraint firstAttribute="width" constant="360" id="OBx-ju-edo"/>
                     </constraints>
-                    <buttonCell key="cell" type="check" title="Enable Mac OS X notifications" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Ae9-FU-cso">
+                    <buttonCell key="cell" type="check" title="Enable macOS notifications" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Ae9-FU-cso">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
diff --git a/AutoPkgr/Views-Controllers-XIB/Tab Views/en.lproj/LGNotificationsViewController.strings b/AutoPkgr/Views-Controllers-XIB/Tab Views/en.lproj/LGNotificationsViewController.strings
index 9e51ee0d..e89a7ac4 100644
--- a/AutoPkgr/Views-Controllers-XIB/Tab Views/en.lproj/LGNotificationsViewController.strings	
+++ b/AutoPkgr/Views-Controllers-XIB/Tab Views/en.lproj/LGNotificationsViewController.strings	
@@ -11,8 +11,8 @@
 /* Class = "BindingConnection"; ibShadowedIsNilPlaceholder = "sender@yourdomain.example"; ObjectID = "7up-e3-Ehs"; */
 "7up-e3-Ehs.ibShadowedIsNilPlaceholder" = "sender@yourdomain.example";
 
-/* Class = "NSButtonCell"; title = "Enable Mac OS X notifications"; ObjectID = "Ae9-FU-cso"; */
-"Ae9-FU-cso.title" = "Enable Mac OS X notifications";
+/* Class = "NSButtonCell"; title = "Enable macOS notifications"; ObjectID = "Ae9-FU-cso"; */
+"Ae9-FU-cso.title" = "Enable macOS notifications";
 
 /* Class = "NSButtonCell"; title = "Send notifications to Slack channel"; ObjectID = "E9P-cr-br5"; */
 "E9P-cr-br5.title" = "Send notifications to Slack channel";
diff --git a/AutoPkgr/Views-Controllers-XIB/Tab Views/es.lproj/LGNotificationsViewController.strings b/AutoPkgr/Views-Controllers-XIB/Tab Views/es.lproj/LGNotificationsViewController.strings
index 29e599e2..95363f70 100644
--- a/AutoPkgr/Views-Controllers-XIB/Tab Views/es.lproj/LGNotificationsViewController.strings	
+++ b/AutoPkgr/Views-Controllers-XIB/Tab Views/es.lproj/LGNotificationsViewController.strings	
@@ -11,8 +11,8 @@
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "sender@yourdomain.example"; ObjectID = "7up-e3-Ehs"; */
 "7up-e3-Ehs.ibShadowedIsNilPlaceholder" = "sender@yourdomain.example";
 
-/* Class = "NSButtonCell"; title = "Enable Mac OS X notifications"; ObjectID = "Ae9-FU-cso"; */
-"Ae9-FU-cso.title" = "Habilitar notificaciones Mac OS X";
+/* Class = "NSButtonCell"; title = "Enable macOS notifications"; ObjectID = "Ae9-FU-cso"; */
+"Ae9-FU-cso.title" = "Habilitar notificaciones macOS";
 
 /* Class = "NSButtonCell"; title = "Send notifications to Slack channel"; ObjectID = "E9P-cr-br5"; */
 "E9P-cr-br5.title" = "Mandar notificaciones al canal Slack";
diff --git a/AutoPkgr/Views-Controllers-XIB/Tab Views/fr.lproj/LGNotificationsViewController.strings b/AutoPkgr/Views-Controllers-XIB/Tab Views/fr.lproj/LGNotificationsViewController.strings
index 6ab52b69..f96cb6ba 100644
--- a/AutoPkgr/Views-Controllers-XIB/Tab Views/fr.lproj/LGNotificationsViewController.strings	
+++ b/AutoPkgr/Views-Controllers-XIB/Tab Views/fr.lproj/LGNotificationsViewController.strings	
@@ -11,8 +11,8 @@
 /* Class = "BindingConnection"; ibShadowedIsNilPlaceholder = "sender@yourdomain.example"; ObjectID = "7up-e3-Ehs"; */
 "7up-e3-Ehs.ibShadowedIsNilPlaceholder" = "sender@yourdomain.example";
 
-/* Class = "NSButtonCell"; title = "Enable Mac OS X notifications"; ObjectID = "Ae9-FU-cso"; */
-"Ae9-FU-cso.title" = "Activer les notifications Mac OS X";
+/* Class = "NSButtonCell"; title = "Enable macOS notifications"; ObjectID = "Ae9-FU-cso"; */
+"Ae9-FU-cso.title" = "Activer les notifications macOS";
 
 /* Class = "NSButtonCell"; title = "Send notifications to Slack channel"; ObjectID = "E9P-cr-br5"; */
 "E9P-cr-br5.title" = "Envoyer des notifications à une chaîne de Slack";
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e64a187c..0a79dace 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased](unreleased)
+
+### Changed
+
+- Updated "Mac OS X" to "macOS" in a few places in the app.
+
+
 ## [1.5] - 2019-07-30
 
 ### Added
@@ -20,7 +27,6 @@ All notable changes to this project will be documented in this file. This projec
 - Updated README.md to reflect Jamf and macOS rebranding.
 - Per Apple’s Notarization requirements, the Notarized AutoPkgr-1.5.dmg has been stapled with the tickets from the Apple Notary Service. This allows full compatibility with GateKeeper when installing in macOS Catalina. Due to this, if you build from source code instead of installing AutoPkgr with the dmg, AutoPkgr may not launch in macOS Catalina.
 
-## [Unreleased](unreleased)
 
 ## [1.4.2] - 2016-10-03
 

From 020cd08ae4e64c409dc3de3c7501f8e3bf0c59da Mon Sep 17 00:00:00 2001
From: Elliot Jordan <elliot@elliotjordan.com>
Date: Thu, 12 Jan 2017 11:46:19 -0800
Subject: [PATCH 2/6] Re-applied change introducing "Update Trust Info for
 Override" right-click action

---
 .../AutoPkg Task/LGAutoPkgErrorHandler.h      | 19 +++++++--------
 .../AutoPkg Task/LGAutoPkgErrorHandler.m      |  3 +++
 .../AutoPkg Task/LGAutoPkgResultHandler.m     |  3 +++
 AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.h  | 11 +++++++++
 AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.m  | 23 +++++++++++++++++++
 .../LGRecipeOverrides.h                       |  1 +
 .../LGRecipeOverrides.m                       | 20 +++++++++++++++-
 .../LGRecipeTableViewController.m             | 16 +++++++++----
 8 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgErrorHandler.h b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgErrorHandler.h
index 18aa0319..1613a9ae 100644
--- a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgErrorHandler.h	
+++ b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgErrorHandler.h	
@@ -44,21 +44,22 @@ typedef NS_OPTIONS(NSInteger, LGAutoPkgVerb) {
     kLGAutoPkgRun = 1 << 0,
     kLGAutoPkgListRecipes = 1 << 1,
     kLGAutoPkgMakeOverride = 1 << 2,
-    kLGAutoPkgSearch = 1 << 3,
-    kLGAutoPkgInfo = 1 << 4,
+    kLGAutoPkgTrustOverride = 1 << 3,
+    kLGAutoPkgSearch = 1 << 4,
+    kLGAutoPkgInfo = 1 << 5,
 
     // repo verbs
-    kLGAutoPkgRepoAdd = 1 << 5,
-    kLGAutoPkgRepoDelete = 1 << 6,
-    kLGAutoPkgRepoUpdate = 1 << 7,
-    kLGAutoPkgRepoList = 1 << 8,
+    kLGAutoPkgRepoAdd = 1 << 6,
+    kLGAutoPkgRepoDelete = 1 << 7,
+    kLGAutoPkgRepoUpdate = 1 << 8,
+    kLGAutoPkgRepoList = 1 << 9,
 
     // processor verbs
-    kLGAutoPkgProcessorInfo = 1 << 9,
-    kLGAutoPkgListProcessors = 1 << 10,
+    kLGAutoPkgProcessorInfo = 1 << 10,
+    kLGAutoPkgListProcessors = 1 << 11,
 
     // other verbs
-    kLGAutoPkgVersion = 1 << 11,
+    kLGAutoPkgVersion = 1 << 12,
 };
 
 @interface LGAutoPkgErrorHandler : NSObject
diff --git a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgErrorHandler.m b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgErrorHandler.m
index f93bfa12..35db60b7 100644
--- a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgErrorHandler.m	
+++ b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgErrorHandler.m	
@@ -42,6 +42,9 @@
     case kLGAutoPkgMakeOverride:
         message = NSLocalizedStringFromTable(@"Error creating recipe override file", @"LocalizableAutoPkg", nil);
         break;
+    case kLGAutoPkgTrustOverride:
+        message = NSLocalizedStringFromTable(@"Error updating trust in override file", @"LocalizableAutoPkg", nil);
+        break;
     case kLGAutoPkgSearch:
         message = NSLocalizedStringFromTable(@"Error encountered searching for recipe", @"LocalizableAutoPkg", nil);
         break;
diff --git a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgResultHandler.m b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgResultHandler.m
index 36ea2783..4dfe38bc 100644
--- a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgResultHandler.m	
+++ b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgResultHandler.m	
@@ -108,6 +108,9 @@ - (id)results
         case kLGAutoPkgMakeOverride: {
             break;
         }
+        case kLGAutoPkgTrustOverride: {
+            break;
+        }
 #pragma mark Search
         case kLGAutoPkgSearch: {
 
diff --git a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.h b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.h
index e00a1f97..43b426ce 100644
--- a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.h	
+++ b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.h	
@@ -270,6 +270,17 @@ extern NSString *const kLGPostProcessorDefaultsKey;
 
 + (void)makeOverride:(NSString *)recipe name:(NSString *)name
                reply:(void (^)(NSString *newOverrideFile, NSError *error))reply;
+/**
+ *  Equivalent to /usr/bin/local/autopkg update-trust-info [recipe]
+ *
+ *  @param recipe Recipe override file in which trust information will be added or updated
+ *  @param reply The block to be executed on upon task completion. This block has no return value and takes two arguments: NSString representing the full path the the newly trusted override and NSError that is populated should an error occur.
+ */
++ (void)updateTrustInfo:(NSString *)recipe
+                  reply:(void (^)(NSString *trustedOverride, NSError *error))reply;
+
++ (void)updateTrustInfo:(NSString *)recipe name:(NSString *)name
+                  reply:(void (^)(NSString *trustedOverride, NSError *error))reply;
 /**
  *  Equivalent to /usr/bin/local/autopkg list-recipes
  *
diff --git a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.m b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.m
index 7437914c..50901aec 100644
--- a/AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.m	
+++ b/AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.m	
@@ -57,6 +57,7 @@
             @"run" : @(kLGAutoPkgRun),
             @"list-recipes" : @(kLGAutoPkgListRecipes),
             @"make-override" : @(kLGAutoPkgMakeOverride),
+            @"update-trust-info" : @(kLGAutoPkgTrustOverride),
             @"search" : @(kLGAutoPkgSearch),
             @"info" : @(kLGAutoPkgInfo),
             @"repo-add" : @(kLGAutoPkgRepoAdd),
@@ -1005,6 +1006,28 @@ + (void)makeOverride:(NSString *)recipe name:(NSString *)name reply:(void (^)(NS
     }];
 }
 
++ (void)updateTrustInfo:(NSString *)recipe reply:(void (^)(NSString *, NSError *))reply
+{
+    LGAutoPkgTask *task = [[LGAutoPkgTask alloc] init];
+    NSMutableArray *args = [@[ @"update-trust-info", recipe ] mutableCopy];
+
+    task.arguments = args;
+    __weak typeof(task) weakTask = task;
+    [task launchInBackground:^(NSError *error) {
+        typeof(task) strongTask = weakTask;
+        NSMutableString *path = nil;
+        if (!error) {
+            path = [strongTask.standardOutString.trimmed mutableCopy];
+            [path deleteCharactersInRange:[path rangeOfString:@"Wrote updated "]];
+            if ((path.length > 2) && ([path characterAtIndex:path.length - 1] == '.')) {
+                [path deleteCharactersInRange:NSMakeRange(path.length - 1, 1)];
+            }
+        }
+
+        reply(path, error);
+    }];
+}
+
 + (NSArray *)listRecipes
 {
     LGAutoPkgTask *task = [[LGAutoPkgTask alloc] initWithArguments:@[ @"list-recipes" ]];
diff --git a/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeOverrides.h b/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeOverrides.h
index af11c79b..fdb9cc78 100644
--- a/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeOverrides.h	
+++ b/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeOverrides.h	
@@ -31,6 +31,7 @@ extern NSString *const kLGNotificationOverrideDeleted;
 + (NSArray *)recipeEditors;
 + (NSMenuItem *)setRecipeEditor:(NSMenuItem *)item;
 + (void)createOverride:(NSMenuItem *)sender;
++ (void)trustOverride:(NSMenuItem *)sender;
 + (void)deleteOverride:(NSMenuItem *)sender;
 + (void)revealInFinder:(NSMenuItem *)sender;
 
diff --git a/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeOverrides.m b/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeOverrides.m
index 3d1af9f0..7fb8226c 100644
--- a/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeOverrides.m	
+++ b/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeOverrides.m	
@@ -102,6 +102,24 @@ + (void)deleteOverride:(NSMenuItem *)sender
     }
 }
 
++ (void)trustOverride:(NSMenuItem *)sender
+{
+    LGAutoPkgRecipe *recipe = sender.representedObject;
+
+    NSString *recipeName = recipe.Name;
+    NSString *recipeIdentifier = recipe.Identifier;
+
+    if (recipeIdentifier && ![recipe.Name isEqualToString:@"MakeCatalogs.munki"]) {
+        DevLog(@"Updating trust info for %@", recipeName);
+        [LGAutoPkgTask updateTrustInfo:recipeIdentifier reply:^(NSString *path, NSError *error) {
+            if (error) {
+                DLog(@"%@", error.localizedDescription);
+                [NSApp presentError:error];
+            }
+        }];
+    }
+}
+
 + (NSString *)promptForOverrideName:(NSString *)parentName
 {
     NSString *password;
@@ -137,7 +155,7 @@ + (void)openFile:(NSMenuItem *)sender
         [[NSWorkspace sharedWorkspace] openFile:recipePath];
     }
     else {
-        NSLog(@"There was a problem opening the Recipe override file");
+        NSLog(@"There was a problem opening the recipe override file.");
     }
 }
 
diff --git a/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeTableViewController.m b/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeTableViewController.m
index d366cda4..8f83e5e8 100644
--- a/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeTableViewController.m	
+++ b/AutoPkgr/Views-Controllers-XIB/Recipes & Repos Table Controllers/LGRecipeTableViewController.m	
@@ -440,6 +440,7 @@ - (NSMenu *)contextualMenuForRow:(NSInteger)row
     // Set up menu items for overrides.
 
     if ([LGRecipeOverrides overrideExistsForRecipe:recipe]) {
+        // "Open Recipe Override" menu item.
         NSMenuItem *openRecipeItem = [[NSMenuItem alloc] initWithTitle:@"Open Recipe Override" action:@selector(openFile:) keyEquivalent:@""];
         openRecipeItem.target = [LGRecipeOverrides class];
         openRecipeItem.representedObject = recipe;
@@ -451,18 +452,23 @@ - (NSMenu *)contextualMenuForRow:(NSInteger)row
         showInFinderItem.target = [LGRecipeOverrides class];
         [menu addItem:showInFinderItem];
 
+        // "Update Trust Info" menu item.
+        NSMenuItem *trustOverrideItem = [[NSMenuItem alloc] initWithTitle:@"Update Trust Info for Override" action:@selector(trustOverride:) keyEquivalent:@""];
+        trustOverrideItem.representedObject = recipe;
+        trustOverrideItem.target = [LGRecipeOverrides class];
+        [menu addItem:trustOverrideItem];
+
         // "Delete Override" menu item.
         NSMenuItem *removeOverrideItem = [[NSMenuItem alloc] initWithTitle:@"Remove Override" action:@selector(deleteOverride:) keyEquivalent:@""];
-
         removeOverrideItem.representedObject = recipe;
         removeOverrideItem.target = [LGRecipeOverrides class];
         [menu addItem:removeOverrideItem];
     }
     else {
-        NSMenuItem *openRecipeItem = [[NSMenuItem alloc] initWithTitle:@"Create Override" action:@selector(createOverride:) keyEquivalent:@""];
-        openRecipeItem.representedObject = recipe;
-        openRecipeItem.target = [LGRecipeOverrides class];
-        [menu addItem:openRecipeItem];
+        NSMenuItem *createOverrideItem = [[NSMenuItem alloc] initWithTitle:@"Create Override" action:@selector(createOverride:) keyEquivalent:@""];
+        createOverrideItem.representedObject = recipe;
+        createOverrideItem.target = [LGRecipeOverrides class];
+        [menu addItem:createOverrideItem];
     }
 
     return menu;

From 4e859758eb800c4aafabb1e316114657cc81f50f Mon Sep 17 00:00:00 2001
From: Shawn Honsberger <shawn@lindegroup.com>
Date: Wed, 21 Aug 2019 16:54:00 -0700
Subject: [PATCH 3/6] 1.5.1-dev, build 1396 Commit

Updated version to 1.5.1, build number to 1396, updated jssimporter integration urls, identifiers, packages (e.g. from sheacraig to jssimporter), placeholder and credits, and updated overall credits to relflect current team.
---
 .../Install-Uninstall/LGPackageRemover.m      |  1 +
 .../Integrations/LGJSSImporterIntegration.m   | 16 +++++++----
 AutoPkgr/Supporting Files/AutoPkgr-Info.plist |  4 +--
 .../Supporting Files/en.lproj/Credits.rtf     |  6 ++--
 .../Supporting Files/es.lproj/Credits.rtf     |  6 ++--
 .../Supporting Files/fr.lproj/Credits.rtf     |  6 ++--
 AutoPkgr/Utility/LGConstants.m                |  2 +-
 .../LGJSSImporterIntegrationView.xib          | 28 +++++++++----------
 .../LGJSSImporterIntegrationView.strings      |  4 +--
 .../LGJSSImporterIntegrationView.strings      |  4 +--
 .../LGJSSImporterIntegrationView.strings      |  4 +--
 Privileged Helper/helper-Info.plist           |  4 +--
 12 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/AutoPkgr/Models/Install-Uninstall/LGPackageRemover.m b/AutoPkgr/Models/Install-Uninstall/LGPackageRemover.m
index da09786b..4c7fe33f 100644
--- a/AutoPkgr/Models/Install-Uninstall/LGPackageRemover.m
+++ b/AutoPkgr/Models/Install-Uninstall/LGPackageRemover.m
@@ -357,6 +357,7 @@ + (NSArray *)validRemovablePackages
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         packages = @[
+            @"com.github.jssimporter",
             @"com.github.sheagcraig.jssimporter",
             @"com.github.sheagcraig.jss-autopkg-addon",
             @"com.github.tburgin.AbsoluteManageExport",
diff --git a/AutoPkgr/Models/Integrations/LGJSSImporterIntegration.m b/AutoPkgr/Models/Integrations/LGJSSImporterIntegration.m
index 98a4af94..93712354 100644
--- a/AutoPkgr/Models/Integrations/LGJSSImporterIntegration.m
+++ b/AutoPkgr/Models/Integrations/LGJSSImporterIntegration.m
@@ -36,17 +36,17 @@ + (NSString *)name
 
 + (NSURL *)homePage
 {
-    return [NSURL URLWithString:@"https://github.com/sheagcraig/JSSImporter"];
+    return [NSURL URLWithString:@"https://github.com/jssimporter/JSSImporter"];
 }
 
 + (NSString *)credits
 {
-    return @"Copyright 2014, 2015 Shea Craig\nhttp://www.apache.org/licenses/LICENSE-2.0";
+    return @"Copyright 2014, 2019 Shea Craig and Graham Pugh\nhttp://www.apache.org/licenses/LICENSE-2.0";
 }
 
 + (NSString *)gitHubURL
 {
-    return @"https://api.github.com/repos/sheagcraig/JSSImporter/releases";
+    return @"https://api.github.com/repos/jssimporter/JSSImporter/releases";
 }
 
 + (NSString *)defaultRepository
@@ -68,7 +68,8 @@ + (NSArray *)components
 
 + (NSArray *)packageIdentifiers
 {
-    return @[ @"com.github.sheagcraig.jssimporter",
+    return @[ @"com.github.jssimporter",
+              @"com.github.sheagcraig.jssimporter",
               @"com.github.sheagcraig.jss-autopkg-addon" ];
 }
 
@@ -90,10 +91,15 @@ - (NSString *)installedVersion
     NSString *jssAddonReceipt = @"/private/var/db/receipts/com.github.sheagcraig.jss-autopkg-addon.plist";
 
     NSString *jssImporterReceipt = @"/private/var/db/receipts/com.github.sheagcraig.jssimporter.plist";
+    
+    NSString *newJssImporterReceipt = @"/private/var/db/receipts/com.github.jssimporter.plist";
 
     if ([[self class] isInstalled]) {
         NSDictionary *receiptDict;
-        if ([fm fileExistsAtPath:jssImporterReceipt]) {
+        if ([fm fileExistsAtPath:newJssImporterReceipt]) {
+            receiptDict = [NSDictionary dictionaryWithContentsOfFile:newJssImporterReceipt];
+        }
+        else if ([fm fileExistsAtPath:jssImporterReceipt]) {
             receiptDict = [NSDictionary dictionaryWithContentsOfFile:jssImporterReceipt];
         }
         else if ([fm fileExistsAtPath:jssAddonReceipt]) {
diff --git a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist
index 42b97581..223172f5 100755
--- a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist	
+++ b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist	
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5</string>
+	<string>1.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1392</string>
+	<string>1396</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/AutoPkgr/Supporting Files/en.lproj/Credits.rtf b/AutoPkgr/Supporting Files/en.lproj/Credits.rtf
index 474b73ad..ad153bf2 100644
--- a/AutoPkgr/Supporting Files/en.lproj/Credits.rtf	
+++ b/AutoPkgr/Supporting Files/en.lproj/Credits.rtf	
@@ -7,7 +7,6 @@
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
 
 \f0\fs22 \cf0 \expnd0\expndtw0\kerning0
-\
 AutoPkgr was created at the\
 Linde Group in Emeryville, California.\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
@@ -21,14 +20,15 @@ Linde Group in Emeryville, California.\
 \f1 \cf0 Original AutoPkgr team:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
 
-\f0 \cf0 James Barclay, Elliot Jordan, and Josh Senick\
+\f0 \cf0 James Barclay, Elliot Jordan, Josh Senick,\
+and Eldon Ahrold\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
 
 \f1 \cf0 Ongoing development:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
 
-\f0 \cf0 Eldon Ahrold and Shawn Honsberger\
+\f0 \cf0 Shawn Honsberger and Elliot Jordan\
 \
 AutoPkgr takes advantage of the following awesome open-source libraries and projects:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
diff --git a/AutoPkgr/Supporting Files/es.lproj/Credits.rtf b/AutoPkgr/Supporting Files/es.lproj/Credits.rtf
index ff61ad00..815dab32 100644
--- a/AutoPkgr/Supporting Files/es.lproj/Credits.rtf	
+++ b/AutoPkgr/Supporting Files/es.lproj/Credits.rtf	
@@ -7,7 +7,6 @@
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
 
 \f0\fs22 \cf0 \expnd0\expndtw0\kerning0
-\
 AutoPkgr fue creado por\
 Linde Group en Emeryville, California.\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
@@ -21,14 +20,15 @@ Linde Group en Emeryville, California.\
 \f1 \cf0 Equipo AutoPkgr original:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
 
-\f0 \cf0 James Barclay, Elliot Jordan, y Josh Senick\
+\f0 \cf0 James Barclay, Elliot Jordan, Josh Senick,\
+y Eldon Ahrold\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
 
 \f1 \cf0 Desarrollo:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
 
-\f0 \cf0 Eldon Ahrold y Shawn Honsberger\
+\f0 \cf0 Shawn Honsberger y Elliot Jordan \
 \
 AutoPkgr hace uso de los siguientes proyectos de c\'f3digo abierto:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
diff --git a/AutoPkgr/Supporting Files/fr.lproj/Credits.rtf b/AutoPkgr/Supporting Files/fr.lproj/Credits.rtf
index 1a9d7b96..1781c237 100644
--- a/AutoPkgr/Supporting Files/fr.lproj/Credits.rtf	
+++ b/AutoPkgr/Supporting Files/fr.lproj/Credits.rtf	
@@ -7,7 +7,6 @@
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
 
 \f0\fs22 \cf0 \expnd0\expndtw0\kerning0
-\
 AutoPkgr a \'e9t\'e9 cr\'e9\'e9 au\
 Linde Group \'e0 Emeryville, en Californie.\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
@@ -21,14 +20,15 @@ Linde Group \'e0 Emeryville, en Californie.\
 \f1 \cf0 \'c9quipe AutoPkgr originale:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
 
-\f0 \cf0 James Barclay, Elliot Jordan et Josh Senick\
+\f0 \cf0 James Barclay, Elliot Jordan, Josh Senick,\
+et Eldon Ahrold\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
 
 \f1 \cf0 \'c9quipe technique actuelle:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
 
-\f0 \cf0 Eldon Ahrold et Shawn Honsberger\
+\f0 \cf0  Shawn Honsberger et Elliot Jordan\
 \
 AutoPkgr s\'92appuie sur des biblioth\'e8ques et des projets open-source formidables\'a0:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\qc\partightenfactor0
diff --git a/AutoPkgr/Utility/LGConstants.m b/AutoPkgr/Utility/LGConstants.m
index 350f6e87..a44b1098 100755
--- a/AutoPkgr/Utility/LGConstants.m
+++ b/AutoPkgr/Utility/LGConstants.m
@@ -31,7 +31,7 @@
 #pragma mark-- GitHub
 NSString *const kLGAutoPkgReleasesJSONURL = @"https://api.github.com/repos/autopkg/autopkg/releases";
 NSString *const kLGGitReleasesJSONURL = @"https://api.github.com/repos/timcharper/git_osx_installer/releases";
-NSString *const kLGJSSImporterJSONURL = @"https://api.github.com/repos/sheagcraig/JSSImporter/releases";
+NSString *const kLGJSSImporterJSONURL = @"https://api.github.com/repos/jssimporter/JSSImporter/releases";
 
 NSString *const kLGAutoPkgRepositoriesJSONURL = @"https://api.github.com/orgs/autopkg/repos?per_page=100";
 NSString *const kLGJSSDefaultRepo = @"https://github.com/autopkg/jss-recipes.git";
diff --git a/AutoPkgr/Views-Controllers-XIB/Integration Views/Base.lproj/LGJSSImporterIntegrationView.xib b/AutoPkgr/Views-Controllers-XIB/Integration Views/Base.lproj/LGJSSImporterIntegrationView.xib
index 306e762f..3662861a 100644
--- a/AutoPkgr/Views-Controllers-XIB/Integration Views/Base.lproj/LGJSSImporterIntegrationView.xib	
+++ b/AutoPkgr/Views-Controllers-XIB/Integration Views/Base.lproj/LGJSSImporterIntegrationView.xib	
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="17G8030" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
         <capability name="box content view" minToolsVersion="7.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="LGJSSImporterIntegrationView">
@@ -27,7 +28,7 @@
             <rect key="frame" x="0.0" y="0.0" width="525" height="245"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fG9-wC-8B0">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fG9-wC-8B0">
                     <rect key="frame" x="19" y="176" width="94" height="14"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="90" id="ZRw-5p-kYq"/>
@@ -38,7 +39,7 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <box title="Distribution Points" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="3Vg-rG-eDO">
+                <box borderType="line" title="Distribution Points" translatesAutoresizingMaskIntoConstraints="NO" id="3Vg-rG-eDO">
                     <rect key="frame" x="17" y="11" width="491" height="147"/>
                     <view key="contentView" id="cO8-nl-8nh">
                         <rect key="frame" x="1" y="1" width="489" height="131"/>
@@ -51,7 +52,7 @@
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" id="Z5b-9F-2lZ" customClass="LGTableView">
-                                            <rect key="frame" x="0.0" y="0.0" width="467" height="19"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="467" height="73"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -77,7 +78,6 @@
                                             </connections>
                                         </tableView>
                                     </subviews>
-                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </clipView>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="75" id="s7j-zM-rKd"/>
@@ -130,7 +130,7 @@
                                     <action selector="removeDistributionPoint:" target="-2" id="Uj3-Vf-Yv1"/>
                                 </connections>
                             </button>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m6t-8F-NVu">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m6t-8F-NVu">
                                 <rect key="frame" x="253" y="16" width="92" height="14"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="88" id="JrR-Wk-XJ5"/>
@@ -157,10 +157,8 @@
                             <constraint firstAttribute="trailing" secondItem="m6t-8F-NVu" secondAttribute="trailing" constant="146" id="iD2-Qw-fNO"/>
                         </constraints>
                     </view>
-                    <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                    <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </box>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ijl-Se-UV6">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ijl-Se-UV6">
                     <rect key="frame" x="225" y="176" width="74" height="14"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="n8p-MZ-L4j"/>
@@ -171,7 +169,7 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eEY-Hf-ysc">
+                <secureTextField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eEY-Hf-ysc">
                     <rect key="frame" x="305" y="174" width="100" height="19"/>
                     <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="password" drawsBackground="YES" usesSingleLineMode="YES" id="WYd-vw-GcJ">
                         <font key="font" metaFont="smallSystem"/>
@@ -223,7 +221,7 @@
                         <action selector="verifySSL:" target="-2" id="nol-ZP-9Og"/>
                     </connections>
                 </button>
-                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Kox-gt-MfQ">
+                <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kox-gt-MfQ">
                     <rect key="frame" x="89" y="203" width="316" height="22"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="https://casper.yourdomain.example:8443/" drawsBackground="YES" id="xHX-mS-zNQ">
                         <font key="font" metaFont="system"/>
@@ -231,7 +229,7 @@
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MRy-Ea-7v9">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MRy-Ea-7v9">
                     <rect key="frame" x="19" y="206" width="64" height="17"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="60" id="qjF-dj-gPE"/>
@@ -242,7 +240,7 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HqD-rL-S3O">
+                <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HqD-rL-S3O">
                     <rect key="frame" x="119" y="174" width="100" height="19"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="autopkgr" drawsBackground="YES" id="pCF-bR-PMc">
                         <font key="font" metaFont="smallSystem"/>
diff --git a/AutoPkgr/Views-Controllers-XIB/Integration Views/en.lproj/LGJSSImporterIntegrationView.strings b/AutoPkgr/Views-Controllers-XIB/Integration Views/en.lproj/LGJSSImporterIntegrationView.strings
index 85892304..80e8afb3 100644
--- a/AutoPkgr/Views-Controllers-XIB/Integration Views/en.lproj/LGJSSImporterIntegrationView.strings	
+++ b/AutoPkgr/Views-Controllers-XIB/Integration Views/en.lproj/LGJSSImporterIntegrationView.strings	
@@ -44,5 +44,5 @@
 /* Class = "NSTextFieldCell"; placeholderString = "autopkgr"; ObjectID = "pCF-bR-PMc"; */
 "pCF-bR-PMc.placeholderString" = "autopkgr";
 
-/* Class = "NSTextFieldCell"; placeholderString = "https://casper.yourdomain.example:8443/"; ObjectID = "xHX-mS-zNQ"; */
-"xHX-mS-zNQ.placeholderString" = "https://casper.yourdomain.example:8443/";
+/* Class = "NSTextFieldCell"; placeholderString = "https://jamf.example.com:8443/"; ObjectID = "xHX-mS-zNQ"; */
+"xHX-mS-zNQ.placeholderString" = "https://jamf.example.com:8443/";
diff --git a/AutoPkgr/Views-Controllers-XIB/Integration Views/es.lproj/LGJSSImporterIntegrationView.strings b/AutoPkgr/Views-Controllers-XIB/Integration Views/es.lproj/LGJSSImporterIntegrationView.strings
index a1a1ede2..82394b7b 100644
--- a/AutoPkgr/Views-Controllers-XIB/Integration Views/es.lproj/LGJSSImporterIntegrationView.strings	
+++ b/AutoPkgr/Views-Controllers-XIB/Integration Views/es.lproj/LGJSSImporterIntegrationView.strings	
@@ -44,5 +44,5 @@
 /* Class = "NSTextFieldCell"; placeholderString = "autopkgr"; ObjectID = "pCF-bR-PMc"; */
 "pCF-bR-PMc.placeholderString" = "autopkgr";
 
-/* Class = "NSTextFieldCell"; placeholderString = "https://casper.yourdomain.example:8443/"; ObjectID = "xHX-mS-zNQ"; */
-"xHX-mS-zNQ.placeholderString" = "https://casper.sudominio.ejemplo:8443/";
+/* Class = "NSTextFieldCell"; placeholderString = "https://jamf.ejemplo.com:8443/"; ObjectID = "xHX-mS-zNQ"; */
+"xHX-mS-zNQ.placeholderString" = "https://jamf.ejemplo.com:8443/";
diff --git a/AutoPkgr/Views-Controllers-XIB/Integration Views/fr.lproj/LGJSSImporterIntegrationView.strings b/AutoPkgr/Views-Controllers-XIB/Integration Views/fr.lproj/LGJSSImporterIntegrationView.strings
index d6a992fb..a0018b1c 100644
--- a/AutoPkgr/Views-Controllers-XIB/Integration Views/fr.lproj/LGJSSImporterIntegrationView.strings	
+++ b/AutoPkgr/Views-Controllers-XIB/Integration Views/fr.lproj/LGJSSImporterIntegrationView.strings	
@@ -44,5 +44,5 @@
 /* Class = "NSTextFieldCell"; placeholderString = "autopkgr"; ObjectID = "pCF-bR-PMc"; */
 "pCF-bR-PMc.placeholderString" = "autopkgr";
 
-/* Class = "NSTextFieldCell"; placeholderString = "https://casper.yourdomain.example:8443/"; ObjectID = "xHX-mS-zNQ"; */
-"xHX-mS-zNQ.placeholderString" = "https://casper.yourdomain.example:8443/";
+/* Class = "NSTextFieldCell"; placeholderString = "https://jamf.example.com:8443/"; ObjectID = "xHX-mS-zNQ"; */
+"xHX-mS-zNQ.placeholderString" = "https://jamf.example.com:8443/";
diff --git a/Privileged Helper/helper-Info.plist b/Privileged Helper/helper-Info.plist
index e192e921..f3b28285 100644
--- a/Privileged Helper/helper-Info.plist	
+++ b/Privileged Helper/helper-Info.plist	
@@ -9,9 +9,9 @@
 	<key>CFBundleName</key>
 	<string>com.lindegroup.AutoPkgr.helper</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5</string>
+	<string>1.5.1</string>
 	<key>CFBundleVersion</key>
-	<string>1395</string>
+	<string>1396</string>
 	<key>SMAuthorizedClients</key>
 	<array>
 		<string>identifier "com.lindegroup.AutoPkgr" 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] = JVY2ZR6SEF</string>

From 1e2008a02b9771d173c7d7a554a3f59308d47cda Mon Sep 17 00:00:00 2001
From: Shawn Honsberger <shawn@lindegroup.com>
Date: Thu, 26 Sep 2019 15:28:11 -0700
Subject: [PATCH 4/6] Updated Build Number to 1404

Updated Build Number and CFBundleVersion to 1404.
---
 AutoPkgr/Supporting Files/AutoPkgr-Info.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist
index 223172f5..c8ec0294 100755
--- a/AutoPkgr/Supporting Files/AutoPkgr-Info.plist	
+++ b/AutoPkgr/Supporting Files/AutoPkgr-Info.plist	
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1396</string>
+	<string>1404</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

From 21550f884e521d9d1387c250d3715e91bfc2b088 Mon Sep 17 00:00:00 2001
From: Shawn Honsberger <shawn@lindegroup.com>
Date: Thu, 26 Sep 2019 15:50:09 -0700
Subject: [PATCH 5/6] Updated CHANGELOG.md

Updated for 1.5.1 additions and changes.
---
 CHANGELOG.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a79dace..018b671d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,20 @@ All notable changes to this project will be documented in this file. This projec
 
 ## [Unreleased](unreleased)
 
-### Changed
+## [1.5.1] - 2019-10-01
+
+### Added
+- AutoPkgr now reports and installs the latest release version of JSSImporter (currently v1.0.2).
 
-- Updated "Mac OS X" to "macOS" in a few places in the app.
+### Changed
+- Updated all package, identifier, and url references of `sheacraig/jssimporter` to `jssimporter/jssimporter`, and its copyright.
+- Updated example url in AutoPkgr’s Folders  & Integrations tab for JSSimporter to reflect Jamf branding.
+- Updated language in AutoPkgr’s Notifications tab to `macOS` to reflect Apple branding.
+- Updated credits.
+- Updated version to 1.5.1.
+- Updated build number to 1404.
+- Updated change log.
+- Per Apple’s Notarization requirements, the Notarized AutoPkgr-1.5.1.dmg has been stapled with the tickets from the Apple Notary Service. This allows full compatibility with GateKeeper when installing in macOS Catalina. Due to this, if you build from source code instead of installing AutoPkgr with the dmg, AutoPkgr may not launch in macOS Catalina.
 
 
 ## [1.5] - 2019-07-30

From 0b6026313e859836b68a99801334f2b040cd5187 Mon Sep 17 00:00:00 2001
From: Shawn Honsberger <shawn@lindegroup.com>
Date: Thu, 26 Sep 2019 16:33:44 -0700
Subject: [PATCH 6/6] Updated README.md and CHANGELOG.md

Updated development team in README.md and CHANGELOG.md notes.
---
 CHANGELOG.md | 3 ++-
 README.md    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 018b671d..fd58c548 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,8 @@ All notable changes to this project will be documented in this file. This projec
 - Updated credits.
 - Updated version to 1.5.1.
 - Updated build number to 1404.
-- Updated change log.
+- Updated CHANGELOG.md.
+- Updated development team in README.md.
 - Per Apple’s Notarization requirements, the Notarized AutoPkgr-1.5.1.dmg has been stapled with the tickets from the Apple Notary Service. This allows full compatibility with GateKeeper when installing in macOS Catalina. Due to this, if you build from source code instead of installing AutoPkgr with the dmg, AutoPkgr may not launch in macOS Catalina.
 
 
diff --git a/README.md b/README.md
index 1d17d865..f6bebe0a 100644
--- a/README.md
+++ b/README.md
@@ -457,7 +457,7 @@ After uninstalling, you can drag the AutoPkgr app from your Applications folder
 
 AutoPkgr was created at [Linde Group](http://www.lindegroup.com) in Emeryville, California. If you're a talented Mac admin looking for a job in the Bay Area, [check out our job listings](http://www.lindegroup.com/careers/). We've got a wonderful team of people and fantastic clients.
 
-James Barclay, Elliot Jordan, and Josh Senick originally created AutoPkgr in June 2014, and ongoing development is led by Eldon Ahrold and Shawn Honsberger.
+AutoPkgr was originally created by James Barclay, Elliot Jordan, and Josh Senick in June 2014, and development was led by Eldon Ahrold until 2016. Current development is led by Shawn Honsberger and Elliot Jordan.
 
 Thanks to Guillaume Gete for helping with the French localization, and to Luis Giraldo for the Spanish localization.