diff --git a/install.sh b/install.sh
index f1810d6..ac6f011 100755
--- a/install.sh
+++ b/install.sh
@@ -60,6 +60,7 @@ LINKED_FILES_HOME=(
 SYSTEMD_SERVICES=(
     "bumblebeed"
     "cronie"
+    "dbus"
     "lightdm"
     "wicd"
 )
diff --git a/system/.config/i3/config b/system/.config/i3/config
index 94386b7..156e703 100644
--- a/system/.config/i3/config
+++ b/system/.config/i3/config
@@ -195,8 +195,6 @@ bindsym $mod+$alt+Right move workspace to output right
 #######################################
 # Startup applications
 #######################################
-#
-exec wicd-client --tray
 
 # Merge .Xresources on boot
 exec xrdb -merge $HOME/.Xresources
diff --git a/system/.config/polybar/config b/system/.config/polybar/config
index 67e4e52..c2f9f38 100644
--- a/system/.config/polybar/config
+++ b/system/.config/polybar/config
@@ -21,8 +21,9 @@ font-2 = Font Awesome 5 Brands:pixelsize=12;3
 font-3 = siji:pixelsize=12;3
 
 modules-left = i3
-modules-center = xwindow 
+modules-center = xwindow
 modules-right = battery volume backlight wlan date 
+separator = |
 
 #wm-restack = i3
 
@@ -69,15 +70,14 @@ label-urgent-padding = 4
 [module/xwindow]
 type = internal/xwindow
 label = %title:0:50:...%
-label-padding = 4
 
 [module/date]
-type = internal/date
-interval = 1.0
-date = %F 
-time = %H:%M:%S
-label =   %date%  %time%
-format = <label>
+type = custom/script
+exec = date +"%F %H:%M:%S"
+format =    <label>
+label = %output%
+interval = 1
+click-left = xdg-open "https://www.google.com/calendar/render#g"
 
 [module/battery]
 type = internal/battery
@@ -124,7 +124,7 @@ type = internal/network
 interface = wlp3s0
 interval = 3.0
 
-format-connected = <ramp-signal> <label-connected>
+format-connected = %{A1:wicd-client -n:}<ramp-signal> <label-connected>%{A}
 format-connected-underline = #9f78e1
 label-connected = %essid%
 
diff --git a/system/.gitconfig b/system/.gitconfig
index 715e2f4..2ce4758 100644
--- a/system/.gitconfig
+++ b/system/.gitconfig
@@ -6,6 +6,9 @@
 	# Display the history of the latest 20 commits
 	l = log --pretty=oneline -n 20 --graph --abbrev-commit
 
+	# Update submodules when pulling
+	pl = !git pull && git submodule update --remote --merge
+
 	# Shortcut for status
 	s = status
 
diff --git a/system/.xsetup b/system/.xsetup
index f1680e2..464eb14 100644
--- a/system/.xsetup
+++ b/system/.xsetup
@@ -20,6 +20,6 @@ xset s noblank
 setxkbmap -model pc105 -layout ch
 
 # Start ibus
-ibus-daemon -drx
+#ibus-daemon -drx
 
 . "${HOME}/bin/resolution.sh"
\ No newline at end of file