diff --git a/.Xresources##class.arch_desktop b/.Xresources##class.arch_desktop
index 5e48eeb..34bfc83 100644
--- a/.Xresources##class.arch_desktop
+++ b/.Xresources##class.arch_desktop
@@ -2,5 +2,3 @@ xterm*faceName: MesloLGS NF
 xterm*faceSize: 13
 
 Xft.dpi: 110
-
-xscreensaver.newLoginCommand: lxdm -c USER_SWITCH
diff --git a/.config/custom_scripts/git_auto_save.sh b/.config/custom_scripts/git_auto_save.sh
deleted file mode 100644
index e69de29..0000000
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index c61a4a0..31441b6 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -1,4 +1,5 @@
 configuration {
 	font: "hack 30";
-	theme: "breeze-dark";
 }
+
+@theme "breeze-dark"
diff --git a/.custom_functions b/.custom_functions
deleted file mode 100644
index 7988d1c..0000000
--- a/.custom_functions
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-custom_func_dir=$HOME/.config/custom_shell_functions
-for f in $custom_func_dir/*; do source $f; done
-
-function connectToServer() {
-	ssh alex@65.21.140.171
-}
-
-function connectToStorageVM() {
-	ssh alex@173.212.206.52
-}
-
-function connectToVM01() {
- 	ssh alex@167.86.117.202
-}
-
-function connectToBackupServer() {
-	ssh alex@161.97.184.228
-}
-
-function connectToPi() {
-	ssh alex@192.168.0.205
-}
-
-function activate() {
-	source ./venv/bin/activate
-}
diff --git a/.terminal_aliases b/.terminal_aliases
index 4ae62c1..26bdd78 100644
--- a/.terminal_aliases
+++ b/.terminal_aliases
@@ -2,3 +2,7 @@ alias spotify='spotify --force-device-scale-factor=2'
 alias ll='ls -la --color=auto'
 
 alias hibernate='systemctl hibernate'
+
+# connection manager
+alias connect='nmcli connection up'
+alias networks='nmcli device wifi list'
diff --git a/.xinitrc##class.arch_desktop b/.xinitrc##class.arch_desktop
index ff5aa09..9628ca5 100644
--- a/.xinitrc##class.arch_desktop
+++ b/.xinitrc##class.arch_desktop
@@ -1,5 +1,9 @@
+#!/bin/bash
+export AWT_TOOLKIT=MToolkit
+
 sleep 10 & xset s 300 0 & xset s noblank & xset -dpms & xsetroot -solid black &
 
 blueman-applet &
 xbindkeys &
+numlockx &
 
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 74e4d3c..032b571 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -509,9 +509,6 @@ myManageHook = composeAll
 --
 -- By default, do nothing.
 myStartupHook = do
-  spawnOnce "nitrogen --restore &"
-  spawnOnce "picom -b &"
-  spawnOnce "light-locker &"
   --  spawn once not necessary here, since the launch script takes care of multiple instances
   spawn "~/.config/polybar/launch.sh" 
   spawnOnce "redshift ~/.config/redshift/redshift.conf &"
@@ -519,7 +516,6 @@ myStartupHook = do
   spawnOnce "sleep 2 && nextcloud &"
   --spawnOnce "xscreensaver -nosplash &"
   spawnOnce "flameshot &"
-  spawnOnce "xfce4-power-manager &"
 	
   -- spawn startup programs at specific workspaces
 
diff --git a/.xprofile##class.arch_desktop b/.xprofile##class.arch_desktop
index 66cba23..6d1da6e 100644
--- a/.xprofile##class.arch_desktop
+++ b/.xprofile##class.arch_desktop
@@ -1,8 +1,5 @@
-blueman-applet &
-xbindkeys &
-xrdb -merge ~/.Xresources &
 xrandr --dpi 110 &
-
-xset s 300 0 & xset s noblank & xset -dpms & xsetroot -solid black &
+xrdb -merge ~/.Xresources &
 
 systemd-run --user --on-calendar=minutely --unit=polybar_auto_hide /usr/bin/polybar-msg cmd hide &
+
diff --git a/.xprofile##class.arch_laptop b/.xprofile##class.arch_laptop
index bd3ea1d..5ec397a 100644
--- a/.xprofile##class.arch_laptop
+++ b/.xprofile##class.arch_laptop
@@ -1,6 +1,12 @@
 blueman-applet &
 xbindkeys &
 optimus-manager-qt &
+nitrogen --restore &
+light-locker &
+picom -b &
+xfce4-power-manager &
+
+
 xrdb -merge ~/.Xresources
 xrandr --dpi 210
 export GDK_SCALE=2
diff --git a/.zshrc b/.zshrc
index d1b34bb..b81e991 100644
--- a/.zshrc
+++ b/.zshrc
@@ -33,7 +33,8 @@ if [ -d $HOME/.local/bin  ] ; then
 fi
 
 # add the custom functions from the .custom_functions file
-source $HOME/.custom_functions
+custom_func_dir=$HOME/.config/custom_shell_functions
+for f in $custom_func_dir/*; do source $f; done
 
 # key bindings
 # create a zkbd compatible hash;