From fd8358a8995df02e449f2b702cf296fca18cb4b8 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Fri, 11 Jan 2019 14:17:41 -0700
Subject: [PATCH 1/3] Fix ODT path

---
 .bin/Scripts/functions/update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index 07fe6e8f..adb26c6d 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -630,7 +630,7 @@ def update_office():
   download_to_temp('odt.exe', SOURCE_URLS['Office Deployment Tool'])
   cmd = [
     r'{}\odt.exe'.format(global_vars['TmpDir']),
-    r'/extract:{}\odt'.format(_out_path),
+    r'/extract:{}'.format(_out_path),
     '/quiet',
     ]
   run_program(cmd)

From 6c47650c2dc1eb97c1e46d36b7295af1cd82fb9e Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Fri, 11 Jan 2019 14:18:01 -0700
Subject: [PATCH 2/3] Updated IOBit Uninstaller

---
 .bin/Scripts/settings/sources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py
index 236ba1a8..2dbd8a91 100644
--- a/.bin/Scripts/settings/sources.py
+++ b/.bin/Scripts/settings/sources.py
@@ -21,7 +21,7 @@ SOURCE_URLS = {
   'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
   'HWiNFO': 'https://www.fosshub.com/HWiNFO.html?dwl=hwi_600.zip',
   'Intel SSD Toolbox': r'https://downloadmirror.intel.com/28447/eng/Intel%20SSD%20Toolbox%20-%20v3.5.8.exe',
-  'IOBit_Uninstaller': 'https://portableapps.duckduckgo.com/IObitUninstallerPortable_7.5.0.7.paf.exe',
+  'IOBit_Uninstaller': r'https://portableapps.com/redirect/?a=IObitUninstallerPortable&s=s&d=pa&f=IObitUninstallerPortable_7.5.0.7.paf.exe',
   'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe',
   'Macs Fan Control': 'https://www.crystalidea.com/downloads/macsfancontrol_setup.exe',
   'NirCmd32': 'https://www.nirsoft.net/utils/nircmd.zip',

From bece9837b245580b8da7988737098c41be87679a Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Fri, 11 Jan 2019 14:42:18 -0700
Subject: [PATCH 3/3] Moved Office 2019 installers to their own folder

---
 .bin/Scripts/settings/launchers.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py
index 73dc14d1..2e88f058 100644
--- a/.bin/Scripts/settings/launchers.py
+++ b/.bin/Scripts/settings/launchers.py
@@ -357,61 +357,63 @@ LAUNCHERS = {
       },
     },
   r'Installers\Extras\Office\2016': {
-    'Home and Business 2016 (x32)': {
+    'Home and Business (x32)': {
       'L_TYPE': 'Office',
       'L_PATH': '2016',
       'L_ITEM': '2016_hb_32.xml',
       'L_NCMD': 'True',
       },
-    'Home and Business 2016 (x64)': {
+    'Home and Business (x64)': {
       'L_TYPE': 'Office',
       'L_PATH': '2016',
       'L_ITEM': '2016_hb_64.xml',
       'L_NCMD': 'True',
       },
-    'Home and Student 2016 (x32)': {
+    'Home and Student (x32)': {
       'L_TYPE': 'Office',
       'L_PATH': '2016',
       'L_ITEM': '2016_hs_32.xml',
       'L_NCMD': 'True',
       },
-    'Home and Student 2016 (x64)': {
+    'Home and Student (x64)': {
       'L_TYPE': 'Office',
       'L_PATH': '2016',
       'L_ITEM': '2016_hs_64.xml',
       'L_NCMD': 'True',
       },
-    'Home and Business 2019 (x32)': {
+    },
+  r'Installers\Extras\Office\2019': {
+    'Home and Business (x32)': {
       'L_TYPE': 'Office',
       'L_PATH': '2019',
       'L_ITEM': '2019_hb_32.xml',
       'L_NCMD': 'True',
       },
-    'Home and Business 2019 (x64)': {
+    'Home and Business (x64)': {
       'L_TYPE': 'Office',
       'L_PATH': '2019',
       'L_ITEM': '2019_hb_64.xml',
       'L_NCMD': 'True',
       },
-    'Home and Student 2019 (x32)': {
+    'Home and Student (x32)': {
       'L_TYPE': 'Office',
       'L_PATH': '2019',
       'L_ITEM': '2019_hs_32.xml',
       'L_NCMD': 'True',
       },
-    'Home and Student 2019 (x64)': {
+    'Home and Student (x64)': {
       'L_TYPE': 'Office',
       'L_PATH': '2019',
       'L_ITEM': '2019_hs_64.xml',
       'L_NCMD': 'True',
       },
-    'Office 365 2019 (x32)': {
+    'Office 365 (x32)': {
       'L_TYPE': 'Office',
       'L_PATH': '2019',
       'L_ITEM': '365_32.xml',
       'L_NCMD': 'True',
       },
-    'Office 365 2019 (x64)': {
+    'Office 365 (x64)': {
       'L_TYPE': 'Office',
       'L_PATH': '2019',
       'L_ITEM': '365_64.xml',