Index: scripts/wifi_disconnect_network.sh
===================================================================
diff -u -r8acba391c1ea0e58c3e61c3d9e956f1edd1bc901 -r3e7cdf9b112dc6e865323e8381cecfd5d988a927
--- scripts/wifi_disconnect_network.sh	(.../wifi_disconnect_network.sh)	(revision 8acba391c1ea0e58c3e61c3d9e956f1edd1bc901)
+++ scripts/wifi_disconnect_network.sh	(.../wifi_disconnect_network.sh)	(revision 3e7cdf9b112dc6e865323e8381cecfd5d988a927)
@@ -22,10 +22,14 @@
 fi
 
 iface=$1
-killall wpa_supplicant
-rm -f /etc/wpa_supplicant.conf
 
-#reset interface
+# stop the wpa service
+systemctl stop wpa_supplicant@"$iface".service
+
+#remove the wpa configuration file
+rm -f /etc/wpa_supplicant/wpa_supplicant-"$iface".conf
+
+#Shutoff wifi interface
 ip link set $iface down
-ip link set $iface up
 
+
Index: scripts/wifi_generate_wpa_supplicant.sh
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r3e7cdf9b112dc6e865323e8381cecfd5d988a927
--- scripts/wifi_generate_wpa_supplicant.sh	(.../wifi_generate_wpa_supplicant.sh)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ scripts/wifi_generate_wpa_supplicant.sh	(.../wifi_generate_wpa_supplicant.sh)	(revision 3e7cdf9b112dc6e865323e8381cecfd5d988a927)
@@ -40,7 +40,7 @@
     group=CCMP TKIP
     scan_ssid=1
     #psk=\"<password_here>\"
-    psk=$psk
+    psk="$psk"
 }" > $dest;;
     wpa) 
         echo "Security: wpa";
@@ -51,7 +51,7 @@
 network={
     ssid=\"$ssid\"
     #psk=\"<password_here>\"
-    psk=$psk
+    psk="$psk"
 }" > $dest;;
     wep)
         echo "Security: wep";
Index: scripts/wifi_start_wpa_supplicant.sh
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r3e7cdf9b112dc6e865323e8381cecfd5d988a927
--- scripts/wifi_start_wpa_supplicant.sh	(.../wifi_start_wpa_supplicant.sh)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ scripts/wifi_start_wpa_supplicant.sh	(.../wifi_start_wpa_supplicant.sh)	(revision 3e7cdf9b112dc6e865323e8381cecfd5d988a927)
@@ -23,8 +23,10 @@
 
 iface=$1
 wpa_supplicant_path=$2
-wpa_cli terminate
-killall udhcpc
-killall wpa_supplicant
-sleep 1
-wpa_supplicant -B -i $iface -c $wpa_supplicant_path wext
+
+# restart the wpa_supplicant service for wifi
+systemctl restart wpa_supplicant@"$iface".service
+
+# make sure that the ethernet is enabled
+udhcpc eth0 &
+
Index: sources/wifi/WifiInterface.h
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r3e7cdf9b112dc6e865323e8381cecfd5d988a927
--- sources/wifi/WifiInterface.h	(.../WifiInterface.h)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/wifi/WifiInterface.h	(.../WifiInterface.h)	(revision 3e7cdf9b112dc6e865323e8381cecfd5d988a927)
@@ -70,7 +70,7 @@
 
     const QString _scriptsFolder         = Storage::Scripts_Path_Name;
     const QString _iface                 = "wlan0";
-    const QString _wpaSupplicantConfPath = "/etc/wpa_supplicant.conf";
+    const QString _wpaSupplicantConfPath = "/etc/wpa_supplicant/wpa_supplicant-wlan0.conf";
 
 // Singleton
 SINGLETON(WifiInterface)