diff --git a/arch-setup/AUR.txt b/arch-setup/AUR.txt
index 68154ce0..d559bddb 100644
--- a/arch-setup/AUR.txt
+++ b/arch-setup/AUR.txt
@@ -7,7 +7,6 @@ betterlockscreen
 bitwarden
 bitwarden-cli
 brave-bin
-canto-next-git
 checkupdates+aur
 checkupdates-aur
 cordless-bin
diff --git a/arch-setup/nonAUR.txt b/arch-setup/nonAUR.txt
index c57f6905..225cd574 100644
--- a/arch-setup/nonAUR.txt
+++ b/arch-setup/nonAUR.txt
@@ -62,7 +62,6 @@ cairo
 cairomm
 calibre
 cantarell-fonts
-canto-curses
 capnproto
 capstone
 cblas
diff --git a/install.sh b/install.sh
index ded9ced8..90e0c845 100755
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+username=$(whoami)
 # Install packages
 echo "Running update"
 sudo pacman --noconfirm -Syu
@@ -139,11 +140,12 @@ ln -s ~/.dotfiles/zsh/profile ~/.profile
 ln -s ~/.dotfiles/mail/mutt ~/.config/mutt
 ln -s ~/.dotfiles/mail/msmtp ~/.config/msmtp
 ln -s ~/.dotfiles/mail/mbsyncrc ~/.mbsyncrc
-if [ ! -f "/var/spool/cron/yigit"]; then
-  sudo touch /var/spool/cron/yigit
-  sudo chown yigit:yigit /var/spool/cron/yigit
+if [ ! -f "/var/spool/cron$username" ]; then
+  sudo touch "/var/spool/cron/$username"
+  sudo chown yigit:yigit "/var/spool/cron/$username"
+  sudo chmod 755 "/var/spool/cron/$username"
 fi
-echo "*/8 * * * * /home/$(whoami)/.scripts/mailsync" >> /var/spool/cron/yigit
+echo "*/8 * * * * /home/$username/.scripts/mailsync" >> /var/spool/cron/yigit
 
 # Root
 sudo cp ~/.dotfiles/root/dwm.desktop /usr/share/xsessions
@@ -184,8 +186,12 @@ sudo npm i -g
 cd $prev
 
 # Install simcrop
-sudo pacman -S opencv
+sudo pacman --needed --noconfirm -S opencv
 git clone https://github.com/theFr1nge/simcrop.git /tmp/simcrop
 cd /tmp/simcrop
 sudo make install
 cd $prev
+
+if [ ! "$username" = "yigit" ]; then
+  find /home/$username -type f | xargs sed -i  "s/\/home\/yigit/\/home\/$username/g"
+fi
diff --git a/misc/keyboard b/misc/keyboard
index 28117584..4bc0613e 100755
--- a/misc/keyboard
+++ b/misc/keyboard
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-setxkbmap us,tr -variant altgr-intl, -option caps:escape # Set keyboard layout. map CapsLock to Esc
+setxkbmap "us,tr" -variant "altgr-intl," -option caps:escape # Set keyboard layout. map CapsLock to Esc
 xset r rate 180 40
 xmodmap -e "clear control" -e "add control = Control_L" -e "clear mod3" -e "add mod3 = Control_R" # Map right Ctrl to Mod3Mask
diff --git a/vim/vim/plugin/plugins.vim b/vim/vim/plugin/plugins.vim
index 47e56ffb..a1a058a7 100644
--- a/vim/vim/plugin/plugins.vim
+++ b/vim/vim/plugin/plugins.vim
@@ -23,7 +23,7 @@ Plug 'blarghmatey/split-expander'
 Plug 'farmergreg/vim-lastplace'
 Plug 'jlanzarotta/bufexplorer'
 Plug 'jeffkreeftmeijer/vim-numbertoggle'
-Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
+"Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
 Plug 'sheerun/vim-polyglot'
 Plug 'M4R7iNP/vim-inky'
 Plug 'vim-airline/vim-airline'
diff --git a/xorg/xinitrc b/xorg/xinitrc
index cbd66bc7..1b708071 100755
--- a/xorg/xinitrc
+++ b/xorg/xinitrc
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-pkill -f clipmenud 
-pkill -f "bash /sbin/clipmenud" 
+pkill -f clipmenud
+pkill -f "bash /sbin/clipmenud"
 pkill -f "/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh"
 pkill -f "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1"
 
@@ -37,13 +37,13 @@ picom --no-fading-openclose &
 firefox-developer-edition app.daily.dev&
 bitwarden-desktop &
 curl 'http://yeetclock/setcolor?R=136&G=192&B=208' &
-~/.keyboard
 xbanish -t 2000 -s &
 
 pactl upload-sample /usr/share/sounds/freedesktop/stereo/bell.oga x11-bell
 pactl load-module module-x11-bell sample=x11-bell display=$DISPLAY
 xset b 100
 xset dpms 600 600 600
+~/.keyboard
 
 dunst &