diff --git a/WHITELIST b/WHITELIST
index cac1545..2693618 100644
--- a/WHITELIST
+++ b/WHITELIST
@@ -10,11 +10,15 @@ kano.me
 amazonaws.com
 cloudinary.com
 
+#help centre
+kano.zendesk.com
+
 # Updater
 raspbian.org
 raspberrypi.org
 raspbian.mirror.uk.sargasso.net
 pypi.python.org
+repo-mirror.kano.me.s3.amazonaws.com
 
 # Feedback form
 docs.google.com
diff --git a/bin/kano-settings b/bin/kano-settings
index 0cd5c0c..f05d0b6 100755
--- a/bin/kano-settings
+++ b/bin/kano-settings
@@ -1,15 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/kano-splash loader-animation /usr/bin/env python
 
 # kano-settings
 #
-# Copyright (C) 2014-2015 Kano Computing Ltd.
+# Copyright (C) 2014-2017 Kano Computing Ltd.
 # License: http://www.gnu.org/licenses/gpl-2.0.txt GNU GPL v2
 #
 # Kano Settings executable
-#
+
 
 """
- launches the application Terminal Quest at different points in the story
+Kano Settings is a simple application to change configurations on Raspberry Pi and Kano OS
 
 Usage:
   kano-settings [--plug=<socket-id>] [--id=<screen-id>|--label=<screen-label>|<screen>] [--onescreen]
@@ -20,9 +20,9 @@ Options:
    -l, --label=<screen-label>   Launch on the right screen based on the label
    -i, --id=<screen-id>         Launch on the right screen based on the number
    -o, --onescreen              Close kano-settings after launching one application
-
 """
 
+
 import os
 import sys
 import docopt
@@ -61,8 +61,8 @@ def main(plug=False, socket_id=0, screen_id=None, screen_label=None,
 
 
 if __name__ == "__main__":
-
-    if os.environ['LOGNAME'] != 'root':
+    if os.environ.get('LOGNAME', '') != 'root':
+        os.system("kano-stop-splash")
         exit("Error: Settings must be executed with root privileges")
 
     args = docopt.docopt(__doc__)
diff --git a/debian/changelog b/debian/changelog
index 660fe97..096713a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kano-settings (4.0.5-0) unstable; urgency=low
+
+  * Changes for Kano OS 3.15.0:
+  * Fixed long delay when going into the Notifications menu
+  * Disabled hdmi_drive config option when going into Safe Mode
+  * Add splash animation for Settings app
+
+ -- Team Kano <dev@kano.me>  Tue, 19 Dec 2017 18:28:00 +0100
+
 kano-settings (4.0.4-0) unstable; urgency=low
 
   * Changes for Kano OS 3.14.0:
@@ -8,6 +17,7 @@ kano-settings (4.0.4-0) unstable; urgency=low
   * Added sentinel file on /boot partition to use custom config.txt settings
   * Write /boot/cpuid.txt
   * Ensure that the LightDM configuration exists on boot and regenerate if needed
+  * Add kano zendesk to the parental control whitelist.
 
  -- Team Kano <dev@kano.me>  Tue, 5 Dec 2017 17:22:00 +0100
 
diff --git a/kano_settings/set_notifications.py b/kano_settings/set_notifications.py
index fa6ae1d..948ee57 100644
--- a/kano_settings/set_notifications.py
+++ b/kano_settings/set_notifications.py
@@ -61,11 +61,11 @@ def _add_led_speaker_checkbox(self):
             from kano_peripherals.pi_hat.driver.high_level import \
                 get_pihat_interface
 
-            speaker_led_api = get_speakerleds_interface()
+            speaker_led_api = get_speakerleds_interface(retry_count=0)
             if speaker_led_api:  # can be None
                 is_led_speaker_plugged = speaker_led_api.detect()
 
-            pi_hat_api = get_pihat_interface()
+            pi_hat_api = get_pihat_interface(retry_count=0)
             if pi_hat_api:  # can be None
                 is_pi_hat_plugged = pi_hat_api.detect()
 
diff --git a/kano_settings/system/display.py b/kano_settings/system/display.py
index 6d3867e..718a968 100755
--- a/kano_settings/system/display.py
+++ b/kano_settings/system/display.py
@@ -294,8 +294,14 @@ def set_safeboot_mode():
     set_screen_value('hdmi_force_hotplug', 1)
     set_screen_value('config_hdmi_boost', 4)
 
-    set_screen_value('hdmi_group', 2)
-    set_screen_value('hdmi_mode', 16)
+    set_config_value('hdmi_group', None)
+    set_config_value('hdmi_mode', None)
+
+    set_screen_value('hdmi_group', None)
+    set_screen_value('hdmi_mode', None)
+
+    set_screen_value('hdmi_drive', None)
+    set_config_value('hdmi_drive', None)
 
     set_screen_value('disable_overscan', 1)
     set_screen_value('overscan_left', 0)