diff --git a/.config/calcurse/caldav/config b/.config/calcurse/caldav/config
new file mode 100644
index 00000000..1b5af629
--- /dev/null
+++ b/.config/calcurse/caldav/config
@@ -0,0 +1,64 @@
+# If you want to synchronize calcurse with a CalDAV server using
+# calcurse-caldav, create a new directory ~/.calcurse/caldav/, copy this file
+# to ~/.calcurse/caldav/config and adjust the configuration below.
+
+[General]
+# Path to the calcurse binary that is used for importing/exporting items.
+Binary = calcurse
+
+# Host name of the server that hosts CalDAV.
+Hostname = drive.yigitcolakoglu.com
+
+# Path to the CalDAV calendar on the host specified above.
+Path = remote.php/dav/calendars/yigitcolakoglu/pcalendar
+
+# Type of authentication to use. Must be "basic" or "oauth2"
+AuthMethod = basic
+
+# Enable this if you want to skip SSL certificate checks.
+InsecureSSL = No
+
+# Disable this if you want to use HTTP instead of HTTPS.
+# Using plain HTTP is highly discouraged.
+HTTPS = Yes
+
+# This option allows you to filter the types of tasks synced. To this end, the
+# value of this option should be a comma-separated list of item types, where
+# each item type is either "event", "apt", "recur-event", "recur-apt", "todo",
+# "recur" or "cal". Note that the comma-separated list must not contain any
+# spaces. Refer to the documentation of the --filter-type command line argument
+# of calcurse for more details. Set this option to "cal" if the configured
+# CalDAV server doesn't support tasks, such as is the case with Google
+# Calendar.
+SyncFilter = cal,todo,recur,recur-event,event
+
+# Disable this option to actually enable synchronization. If it is enabled,
+# nothing is actually written to the server or to the local data files. If you
+# combine DryRun = Yes with Verbose = Yes, you get a log of what would have
+# happened with this option disabled.
+DryRun = No
+
+# Enable this if you want detailed logs written to stdout.
+Verbose = Yes
+
+# Credentials for HTTP Basic Authentication. Leave this commented out if you do
+# not want to use authentication.
+[Auth]
+Username = yigitcolakoglu
+
+# Optionally specify additional HTTP headers here.
+#[CustomHeaders]
+#User-Agent = Mac_OS_X/10.9.2 (13C64) CalendarAgent/176
+
+# Use the following to synchronize with an OAuth2-based service
+# such as Google Calendar.
+#[OAuth2]
+#ClientID =
+#ClientSecret =
+
+# Scope of access for API calls. Synchronization requires read/write.
+#Scope = https://www.googleapis.com/auth/calendar
+
+# Change the redirect URI if you receive errors, but ensure that it is identical
+# to the redirect URI you specified in the API settings.
+#RedirectURI = http://127.0.0.1
diff --git a/.local/bin/calsync b/.local/bin/calsync
index 02503649..d288b3ea 100755
--- a/.local/bin/calsync
+++ b/.local/bin/calsync
@@ -5,5 +5,5 @@ eval "$(grep -h -- \
 	"$HOME/.profile" "$HOME/.bash_profile" "$HOME/.zprofile"  "$HOME/.config/zsh/.zprofile" "$HOME/.zshenv" \
 	"$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.config/zsh/.zshrc" "$HOME/.pam_environment" 2>/dev/null)"
 
-CALCURSE_CALDAV_PASSWORD=$(pass show Server/drive.yigitcolakoglu.com/yigitcolakoglu)
+export CALCURSE_CALDAV_PASSWORD=$(pass show Server/drive.yigitcolakoglu.com/yigitcolakoglu)
 calcurse-caldav
diff --git a/.local/bin/dmenu-bluetooth b/.local/bin/dmenu-bluetooth
index c3bc3856..68bf8aa6 100755
--- a/.local/bin/dmenu-bluetooth
+++ b/.local/bin/dmenu-bluetooth
@@ -81,8 +81,8 @@ toggle_discoverable() {
 
 # Checks if a device is connected
 device_connected() {
-    device_info=$(bluetoothctl info ""$1"")
-    if echo ""$device"_info" | grep -q "Connected: yes"; then
+    device_info=$(bluetoothctl info "$1")
+    if echo "$device_info" | grep -q "Connected: yes"; then
         return 0
     else
         return 1
diff --git a/.local/bin/status-bar/network b/.local/bin/status-bar/network
index b4d77bb8..4333b545 100755
--- a/.local/bin/status-bar/network
+++ b/.local/bin/status-bar/network
@@ -22,7 +22,8 @@ echo -n "^c#88c0d0^"
 if  [ "$is_eth_used" -eq 1 ]; then    # wired network is carrying
       icon="  ^d^ " #uF6FF
   elif  [ "$is_wlan_used" -eq 1 ]; then # wireless network is carrying
-      icon="直 ^d^  $(get_ssid)" #uF1EB
+    ssid=$(get_ssid)
+    icon="直 ^d^ ${ssid:0:10}" #uF1EB
     else
       icon="  ^d^" #uf128 # no network
 fi
@@ -30,5 +31,5 @@ fi
 echo -n $icon
 
 case $BLOCK_BUTTON in
-          1) ~/.local/bin/networkmanager_dmenu;;
+          1) ~/.local/bin/connman_dmenu;;
 esac
diff --git a/.local/share/gnupg/gpg-agent.conf b/.local/share/gnupg/gpg-agent.conf
index 6787c571..d4337995 100644
--- a/.local/share/gnupg/gpg-agent.conf
+++ b/.local/share/gnupg/gpg-agent.conf
@@ -1,2 +1,3 @@
 allow-preset-passphrase
 max-cache-ttl 172800
+enable-ssh-support
diff --git a/.profile b/.profile
index 5ea447e8..45d077f8 100755
--- a/.profile
+++ b/.profile
@@ -84,8 +84,8 @@ esac
 
 # Setup SSH
 if [ ! "$SSH_AUTH_SOCK" ]; then
-  eval "$(ssh-agent | head -n 2)"
-  grep -slR "PRIVATE" ~/.ssh/ | xargs ssh-add > /dev/null 2> /dev/null &
+  echo UPDATESTARTUPTTY | gpg-connect-agent 2> /dev/null > /dev/null
+  export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 fi
 
 # Start xinit if logged in from tty1