diff --git a/05-Setting_TimeZone.sh b/05-Setting_TimeZone.sh
index 7655abf..7e6eacc 100644
--- a/05-Setting_TimeZone.sh
+++ b/05-Setting_TimeZone.sh
@@ -6,12 +6,39 @@ source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
 source "$SCRIPTDIR/common/load-defaults.sh"
 
-printf "$COL_LIGHT_BLUE" "* Checking Current Timezone"
-current_timezone=`cat /etc/timezone`
 
-echo $desired_timezone
+get_tz() {
+
+  local tz_type="$1"
+
+  printf "$COL_LIGHT_BLUE" "* Checking Current Timezone in $tz_type"
+
+  if [ "$tz_type" == "/etc/timezone" ]; then
+    current_timezone=`cat /etc/timezone`
+  elif [ "$tz_type" == "timedatectl" ]; then
+    current_timezone=$(timedatectl | grep "zone" | sed -e 's/^[ ]*Time zone: \(.*\) (.*)$/\1/g')
+  fi
+
+  printf "$COL_LIGHT_BLUE" "* Timezone in $tz_type is set to $current_timezone"
+
+
+}
+
+
+declare -a TIMEPLACES=("/etc/timezone" "timedatectl")
+
+for timeitem in "${TIMEPLACES[@]}"
+do
+   get_tz $timeitem
+done
+
 exit
 
+
+
+printf "$COL_LIGHT_BLUE" "* Checking Current Timezone in "
+current_timezone=`cat /etc/timezone`
+
 if [ "$desired_timezone" == 0 ]; then
   sudo dpkg-reconfigure tzdata
 else
diff --git a/10-Checking_Dependencies.sh b/10-Checking_Dependencies.sh
index 1368a1b..45e382b 100644
--- a/10-Checking_Dependencies.sh
+++ b/10-Checking_Dependencies.sh
@@ -4,18 +4,7 @@
 SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
-
-load_defaults=""
-case "$1" in
-    defaults) load_defaults="defaults";;
-    "") load_defaults="";;
-    *) echo "'$1' is not a valid template-setup command";;
-esac
-if [ "$load_defaults" == "defaults" ]; then
-  source $SCRIPTDIR/defaults-dbb.sh
-else
-  source $SCRIPTDIR/defaults-blank.sh
-fi
+source "$SCRIPTDIR/common/load-defaults.sh"
 
 pkgmgr_update
 
diff --git a/15-Tweaking_Systemd_Journalling.sh b/15-Tweaking_Systemd_Journalling.sh
index 78d11fd..3e7f5c0 100644
--- a/15-Tweaking_Systemd_Journalling.sh
+++ b/15-Tweaking_Systemd_Journalling.sh
@@ -4,18 +4,7 @@
 SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
-
-load_defaults=""
-case "$1" in
-    defaults) load_defaults="defaults";;
-    "") load_defaults="";;
-    *) echo "'$1' is not a valid template-setup command";;
-esac
-if [ "$load_defaults" == "defaults" ]; then
-  source $SCRIPTDIR/defaults-dbb.sh
-else
-  source $SCRIPTDIR/defaults-blank.sh
-fi
+source "$SCRIPTDIR/common/load-defaults.sh"
 
 printf "$COL_LIGHT_BLUE" "* Vaccuming Systemd Journal"
 journalctl --vacuum-size=50M
diff --git a/20-Updating_Custom_MOTD.sh b/20-Updating_Custom_MOTD.sh
index 6ec4502..e30d53c 100644
--- a/20-Updating_Custom_MOTD.sh
+++ b/20-Updating_Custom_MOTD.sh
@@ -4,18 +4,7 @@
 SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
-
-load_defaults=""
-case "$1" in
-    defaults) load_defaults="defaults";;
-    "") load_defaults="";;
-    *) echo "'$1' is not a valid template-setup command";;
-esac
-if [ "$load_defaults" == "defaults" ]; then
-  source $SCRIPTDIR/defaults-dbb.sh
-else
-  source $SCRIPTDIR/defaults-blank.sh
-fi
+source "$SCRIPTDIR/common/load-defaults.sh"
 
 ## Start File Loop
 ## For .dependency files In The dependencies Directory
diff --git a/30-Checking_Topgrade_Installation_Status.sh b/30-Checking_Topgrade_Installation_Status.sh
index 995aa6e..9474c7f 100644
--- a/30-Checking_Topgrade_Installation_Status.sh
+++ b/30-Checking_Topgrade_Installation_Status.sh
@@ -4,18 +4,7 @@
 SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
-
-load_defaults=""
-case "$1" in
-    defaults) load_defaults="defaults";;
-    "") load_defaults="";;
-    *) echo "'$1' is not a valid template-setup command";;
-esac
-if [ "$load_defaults" == "defaults" ]; then
-  source $SCRIPTDIR/defaults-dbb.sh
-else
-  source $SCRIPTDIR/defaults-blank.sh
-fi
+source "$SCRIPTDIR/common/load-defaults.sh"
 
 printf "$COL_LIGHT_BLUE" "* Checking for topgrade directory"
 topgrade_install_directory="/opt/topgrade"
diff --git a/40-Checking_Custom_Bash_Aliases.sh b/40-Checking_Custom_Bash_Aliases.sh
index a30f925..2958a5c 100644
--- a/40-Checking_Custom_Bash_Aliases.sh
+++ b/40-Checking_Custom_Bash_Aliases.sh
@@ -4,18 +4,7 @@
 SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
-
-load_defaults=""
-case "$1" in
-    defaults) load_defaults="defaults";;
-    "") load_defaults="";;
-    *) echo "'$1' is not a valid template-setup command";;
-esac
-if [ "$load_defaults" == "defaults" ]; then
-  source $SCRIPTDIR/defaults-dbb.sh
-else
-  source $SCRIPTDIR/defaults-blank.sh
-fi
+source "$SCRIPTDIR/common/load-defaults.sh"
 
 BASHRCFILE="$HOME/.bashrc"
 
diff --git a/50-Checking_IPA_Realm_Join_Status.sh b/50-Checking_IPA_Realm_Join_Status.sh
index 2017d04..45ba387 100644
--- a/50-Checking_IPA_Realm_Join_Status.sh
+++ b/50-Checking_IPA_Realm_Join_Status.sh
@@ -4,18 +4,7 @@
 SCRIPTDIR=$(dirname $0)
 source "$SCRIPTDIR/common/colors.sh"
 source "$SCRIPTDIR/common/functions.sh"
-
-load_defaults=""
-case "$1" in
-    defaults) load_defaults="defaults";;
-    "") load_defaults="";;
-    *) echo "'$1' is not a valid template-setup command";;
-esac
-if [ "$load_defaults" == "defaults" ]; then
-  source $SCRIPTDIR/defaults-dbb.sh
-else
-  source $SCRIPTDIR/defaults-blank.sh
-fi
+source "$SCRIPTDIR/common/load-defaults.sh"
 
 
 # TODO setup /etc/hosts with FQDN and FreeIPA servers