diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index ec5b2373..8746ed79 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -623,14 +623,18 @@ class State():
       v['Objects'] = []
 
     # Update LogDir
-    if not self.quick_mode:
+    if self.quick_mode:
+      global_vars['LogDir'] = '{}/Logs/{}'.format(
+        global_vars['Env']['HOME'],
+        time.strftime('%Y-%m-%d_%H%M_%z'))
+    else:
       global_vars['LogDir'] = '{}/Logs/{}_{}'.format(
         global_vars['Env']['HOME'],
         get_ticket_number(),
         time.strftime('%Y-%m-%d_%H%M_%z'))
-      os.makedirs(global_vars['LogDir'], exist_ok=True)
-      global_vars['LogFile'] = '{}/Hardware Diagnostics.log'.format(
-        global_vars['LogDir'])
+    os.makedirs(global_vars['LogDir'], exist_ok=True)
+    global_vars['LogFile'] = '{}/Hardware Diagnostics.log'.format(
+      global_vars['LogDir'])
     self.progress_out = '{}/progress.out'.format(global_vars['LogDir'])
 
     # Add CPU
diff --git a/.bin/Scripts/functions/osticket.py b/.bin/Scripts/functions/osticket.py
index 5ec9529e..4b3c5adf 100644
--- a/.bin/Scripts/functions/osticket.py
+++ b/.bin/Scripts/functions/osticket.py
@@ -350,7 +350,7 @@ class osTicket():
 
     # Enable CoreStorage searches
     results['Core'] = False
-    if results['Full Diag']:
+    if results['Dev Type'] == 'Disk' and results['Full Diag']:
       num_passed = results['Passed'] + results['N/A'] + results['OVERRIDE']
       if num_passed == len(test_list):
         # We ran all disk tests and all results were acceptable
@@ -524,7 +524,7 @@ class osTicket():
     sql_cmd +=  " VALUES ("
     sql_cmd +=  "   '{}',".format(ticket_id)
     sql_cmd +=  "   '{ID}', '{Name}',".format(**OSTICKET['Staff'])
-    sql_cmd +=  "   '{}',".format(response)
+    sql_cmd +=  "   '{}',".format(response.replace("'", "\\'"))
     sql_cmd +=  "   '{}'".format(time.strftime("%Y-%m-%d %H:%M:%S"))
     sql_cmd +=  " );"
 
diff --git a/.bin/Scripts/settings/setup.py b/.bin/Scripts/settings/setup.py
index e3f504cc..4b402bd7 100644
--- a/.bin/Scripts/settings/setup.py
+++ b/.bin/Scripts/settings/setup.py
@@ -201,6 +201,7 @@ LIBREOFFICE_XCU_DATA = '''<?xml version="1.0" encoding="UTF-8"?>
 <item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.presentation.PresentationDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>Impress MS PowerPoint 2007 XML</value></prop></item>
 <item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.sheet.SpreadsheetDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>Calc MS Excel 2007 XML</value></prop></item>
 <item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.text.TextDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>MS Word 2007 XML</value></prop></item>
+<item oor:path="/org.openoffice.Office.Common/Save/Document"><prop oor:name="WarnAlienFormat" oor:op="fuse"><value>false</value></prop></item>
 </oor:items>
 '''
 
diff --git a/.bin/_Drivers/SDIO/sdi.cfg b/.bin/_Drivers/SDIO/sdi.cfg
index 45b0e7c2..d3cec2ea 100644
--- a/.bin/_Drivers/SDIO/sdi.cfg
+++ b/.bin/_Drivers/SDIO/sdi.cfg
@@ -21,4 +21,4 @@
 -uplimit:1
 -connections:0
 
--expertmode -showdrpnames2 -onlyupdates -preservecfg -novirusalerts
+-expertmode -showdrpnames2 -onlyupdates -preservecfg -novirusalerts -showdrpnames2
diff --git a/.linux_items/include_x/airootfs/etc/skel/.update_conky b/.linux_items/include_x/airootfs/etc/skel/.update_conky
index 0e45e13d..18005927 100755
--- a/.linux_items/include_x/airootfs/etc/skel/.update_conky
+++ b/.linux_items/include_x/airootfs/etc/skel/.update_conky
@@ -1,24 +1,31 @@
 #!/bin/bash
 
+CONFIG_BASE="${HOME}/.conkyrc_base"
+CONFIG_NEW="${HOME}/.conkyrc_new"
+CONFIG_REAL="${HOME}/.conkyrc"
+
 IF_LIST=($(ip l \
   | egrep '^[0-9]+:\s+(eth|en|wl)' \
   | sed -r 's/^[0-9]+:\s+(\w+):.*/\1/' \
   | sort))
 
-# Reset conkyrc to default
-rm "${HOME}/.conkyrc"
-cp "${HOME}/.conkyrc_base" "${HOME}/.conkyrc"
+# Build new config from the default
+rm "${CONFIG_NEW}"
+cp "${CONFIG_BASE}" "${CONFIG_NEW}"
 
-# Add interfaces to conkyrc
+# Add interfaces to conkyrc_new
 for i in "${IF_LIST[@]}"; do
   if [[ "${i:0:1}" == "e" ]]; then
-    sed -i -r "s/#Network/Wired:\${alignr}\${addr $i}\n#Network/" $HOME/.conkyrc
+    sed -i -r "s/#Network/Wired:\${alignr}\${addr $i}\n#Network/" "${CONFIG_NEW}"
   else
-    sed -i -r "s/#Network/Wireless:\${alignr}\${addr $i}\n#Network/" $HOME/.conkyrc
+    sed -i -r "s/#Network/Wireless:\${alignr}\${addr $i}\n#Network/" "${CONFIG_NEW}"
   fi
 done
 
-# Remove '#Network' line to prevent duplicating lines if this script is re-run
-sed -i -r "s/#Network//" $HOME/.conkyrc
+# Replace config if there were changes
+if ! diff -q "${CONFIG_NEW}" "${CONFIG_REAL}" >/dev/null 2>&1; then
+  rm "${CONFIG_REAL}"
+  cp "${CONFIG_NEW}" "${CONFIG_REAL}"
+fi
 
 # vim: sts=2 sw=2 ts=2
diff --git a/Build Linux b/Build Linux
index 6f709a77..d4cd653d 100755
--- a/Build Linux	
+++ b/Build Linux	
@@ -165,7 +165,7 @@ function update_live_env() {
     # Boot config (UEFI)
     mkdir -p "$LIVE_DIR/EFI/boot"
     cp  "/usr/share/refind/refind_x64.efi" "$LIVE_DIR/EFI/boot/bootx64.efi"
-    cp "$ROOT_DIR/Images/rEFInd.jpg" "$LIVE_DIR/EFI/boot/rEFInd.jpg"
+    cp "$ROOT_DIR/Images/rEFInd.png" "$LIVE_DIR/EFI/boot/rEFInd.png"
     rsync -aI "/usr/share/refind/drivers_x64/" "$LIVE_DIR/EFI/boot/drivers_x64/"
     rsync -aI "/usr/share/refind/icons/" "$LIVE_DIR/EFI/boot/icons/" --exclude "/usr/share/refind/icons/svg"
     sed -i "s/%ARCHISO_LABEL%/${label}/" "$LIVE_DIR/EFI/boot/refind.conf"