diff --git a/install.sh b/install.sh
index 8ba9ee0..1c7e423 100755
--- a/install.sh
+++ b/install.sh
@@ -69,8 +69,8 @@ ADD_GROUPS=(
 SYSTEMD_SERVICES=(
     "bumblebeed"
     "cronie"
-    "org.cups.cupsd.service"
-    "wicd"
+    "NetworkManager"
+    "org.cups.cupsd"
 )
 
 #######################################
diff --git a/system/.env b/system/.env
index 9cea725..dba9a6e 100644
--- a/system/.env
+++ b/system/.env
@@ -39,7 +39,7 @@ export npm_config_prefix="$HOME/.node_modules"
 export GOPATH=$HOME/go
 
 # Adding folders to the PATH variable
-export PATH="$PATH:$HOME/bin:$npm_config_prefix/bin:$GOPATH/bin"
+export PATH="$PATH:$HOME/bin:$npm_config_prefix/bin:$GOPATH/bin:$HOME/.config/composer/vendor/bin"
 
 # Set bash prompt
 set_bash_prompt() {
diff --git a/system/.xsetup b/system/.xsetup
index 44806b1..db51f94 100644
--- a/system/.xsetup
+++ b/system/.xsetup
@@ -19,6 +19,9 @@ xset s noblank
 # Set keyboard layout
 setxkbmap -model pc105 -layout ch
 
+# Start network manager
+nm-applet &
+
 # Start redshift
 redshift &