diff --git a/.config/i3/config b/.config/i3/config
index 541f251..7884162 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -351,9 +351,6 @@ mode "resize" {
         bindsym Escape mode "default"
 }
 
-# Lock screen
-bindsym $mod+$alt+l exec --no-startup-id light-locker-command -l
-
 # Autostart applications
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh
 exec --no-startup-id nitrogen --restore; sleep 1; picom --config ~/.config/picom/picom.conf
diff --git a/.setup/packages/base b/.setup/packages/base
new file mode 100644
index 0000000..a86a571
--- /dev/null
+++ b/.setup/packages/base
@@ -0,0 +1,30 @@
+update-grub
+
+mkinitcpio-numlock
+os-prober
+openssh
+ntfs-3g
+jdk-openjdk
+
+nvidia
+bluez
+bluez-utils
+autorandr
+
+lightdm
+lightdm-webkit-theme-aether
+
+wireless_tools
+pulseaudio
+pulseaudio-bluetooth
+playerctl
+picom
+
+psensor
+powertop
+htop
+
+unzip
+
+hunspell-de
+gnome-keyring
diff --git a/.setup/packages/base_desktop b/.setup/packages/base_desktop
deleted file mode 100644
index f34aca6..0000000
--- a/.setup/packages/base_desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-zsh
-zsh-theme-powerline10k-git
-i3-gaps
-alacritty
-blueman
-
-
-
diff --git a/.setup/packages/base_packages b/.setup/packages/base_packages
deleted file mode 100644
index 8b13789..0000000
--- a/.setup/packages/base_packages
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/.setup/packages/desktop_tools b/.setup/packages/desktop_tools
new file mode 100644
index 0000000..8529481
--- /dev/null
+++ b/.setup/packages/desktop_tools
@@ -0,0 +1,37 @@
+zsh
+tmux
+zsh-theme-powerline10k-git
+i3-gaps
+alacritty
+
+rofi
+ranger
+polybar
+
+blueman
+simplescreenrecorder
+redshift
+flameshot
+
+mullvad-vpn
+
+mirage
+ueberzug
+pcmanfm
+pavucontrol
+lxrandr
+
+ttf-icomoon-feather
+
+nextcloud-client
+joplin-desktop
+brave-bin
+firefox
+thunderbird
+signal-desktop
+smplayer
+qbittorrent
+spotify
+qalculate
+evince
+okular
diff --git a/.setup/packages/dev b/.setup/packages/dev
new file mode 100644
index 0000000..abd7c2f
--- /dev/null
+++ b/.setup/packages/dev
@@ -0,0 +1,14 @@
+docker
+docker-compose
+podman
+vagrant
+
+postman
+beekeeper-studio-bin
+code-insiders
+pycharm-professional
+mongodb-compass
+
+yarn
+npm
+