diff --git a/1-software.sh b/1-software.sh
index 929e3d1..3eb8ba2 100755
--- a/1-software.sh
+++ b/1-software.sh
@@ -11,7 +11,8 @@ sudo nala install -y xorg xbacklight xvkbd xinput xorg-dev brightnessctl
 sudo nala install -y python3-pip
 
 # npm
-#sudo nala install -y npm
+sudo nala install -y npm
+
 # Java
 #sudo nala install default-jdk
 
@@ -31,7 +32,7 @@ sudo systemctl enable avahi-daemon
 sudo systemctl enable acpid
 
 # Terminal Emulators
-sudo nala install -y alacritty 
+sudo nala install -y alacritty
 
 # Modern replacement for ls
 sudo nala install -y exa
@@ -63,7 +64,7 @@ sudo systemctl enable bluetooth
 sudo nala install -y telegram-desktop
 
 # Menu and Window Managers
-sudo nala install -y sxhkd numlockx rofi dunst libnotify-bin picom dmenu polybar 
+sudo nala install -y sxhkd numlockx rofi dunst libnotify-bin picom dmenu polybar
 
 # Archive Management
 sudo nala install -y unzip file-roller
@@ -89,17 +90,10 @@ sudo nala install -y gnome-disk-utility bleachbit
 
 
 # Neovim Build prerequisites
-sudo nala install -y ninja-build gettext cmake curl
-
-# Install Neovim
-git clone https://github.com/neovim/neovim
-cd neovim && make CMAKE_BUILD_TYPE=RelWithDebInfo
-git checkout stable
-cd build && cpack -G DEB && sudo dpkg -i nvim-linux64.deb
-
+sudo nala install -y ninja-build gettext cmake curl python3.11-venv
 
 # Required packages for i3-gaps installation
-sudo nala install -y meson dh-autoreconf libxcb-keysyms1-dev libpango1.0-dev libxcb-util0-dev xcb libxcb1-dev libxcb-icccm4-dev libyajl-dev libev-dev libxcb-xkb-dev libxcb-cursor-dev libxkbcommon-dev libxcb-xinerama0-dev libxkbcommon-x11-dev libstartup-notification0-dev libxcb-randr0-dev libxcb-xrm0 libxcb-xrm-dev libxcb-shape0 libxcb-shape0-dev i3status 
+sudo nala install -y meson dh-autoreconf libxcb-keysyms1-dev libpango1.0-dev libxcb-util0-dev xcb libxcb1-dev libxcb-icccm4-dev libyajl-dev libev-dev libxcb-xkb-dev libxcb-cursor-dev libxkbcommon-dev libxcb-xinerama0-dev libxkbcommon-x11-dev libstartup-notification0-dev libxcb-randr0-dev libxcb-xrm0 libxcb-xrm-dev libxcb-shape0 libxcb-shape0-dev i3status cmake
 
 # Brave-Browser
 
diff --git a/2-setup.sh b/2-setup.sh
index 0a84adc..9354a5c 100755
--- a/2-setup.sh
+++ b/2-setup.sh
@@ -3,6 +3,12 @@
 # Update User Directories (Documents,Downloads,...)
 xdg-user-dirs-update
 
+# Install Neovim
+git clone https://github.com/neovim/neovim
+cd neovim && make CMAKE_BUILD_TYPE=RelWithDebInfo
+git checkout stable
+cd build && cpack -G DEB && sudo dpkg -i nvim-linux64.deb
+
 # Installing i3 gaps
 cd
 cd Downloads
@@ -17,7 +23,7 @@ sudo ninja install
 sudo nala install -y libpam0g-dev libxcb-xkb-dev
 
 # Installing Ly Console Display Manager
-cd 
+cd
 cd Downloads
 git clone --recurse-submodules https://github.com/fairyglade/ly
 cd ly/
@@ -39,4 +45,4 @@ Exec=i3
 Icon=i3
 Type=XSession
 EOF
-sudo cp ./temp /usr/share/xsessions/i3.desktop;rm ./temp
\ No newline at end of file
+sudo cp ./temp /usr/share/xsessions/i3.desktop;rm ./temp
diff --git a/optional/terminal_in_pcmanfm.sh b/optional/terminal_in_pcmanfm.sh
index 59bf6fc..d17903a 100755
--- a/optional/terminal_in_pcmanfm.sh
+++ b/optional/terminal_in_pcmanfm.sh
@@ -3,7 +3,7 @@
 sudo su
 
 mkdir -p ~/.local/share/file-manager/actions/
-touch ~/.local/share/file-manager/actions/terminal.desktop 
+touch ~/.local/share/file-manager/actions/terminal.desktop
 echo "[Desktop Entry]
 Type=Action
 Tooltip=Open Terminal
@@ -15,3 +15,5 @@ Icon=utilities-terminal
 MimeTypes=inode/directory;
 Exec=alacritty --working-directory %f
 Name=Default profile" > ~/.local/share/file-manager/actions/terminal.desktop
+
+exit