diff --git a/nvim/after/plugin/telescope.lua b/nvim/after/plugin/telescope.lua
new file mode 100644
index 0000000..e3f49b2
--- /dev/null
+++ b/nvim/after/plugin/telescope.lua
@@ -0,0 +1,5 @@
+local builtin = require('telescope.builtin')
+vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
+vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
+vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
\ No newline at end of file
diff --git a/nvim/init.lua b/nvim/init.lua
new file mode 100644
index 0000000..bfda8e3
--- /dev/null
+++ b/nvim/init.lua
@@ -0,0 +1 @@
+require("luke-else")
\ No newline at end of file
diff --git a/nvim/lua/luke-else/init.lua b/nvim/lua/luke-else/init.lua
new file mode 100644
index 0000000..33dc0a4
--- /dev/null
+++ b/nvim/lua/luke-else/init.lua
@@ -0,0 +1 @@
+require("luke-else.packer")
\ No newline at end of file
diff --git a/nvim/lua/luke-else/packer.lua b/nvim/lua/luke-else/packer.lua
new file mode 100644
index 0000000..1ff8957
--- /dev/null
+++ b/nvim/lua/luke-else/packer.lua
@@ -0,0 +1,21 @@
+vim.cmd [[packadd packer.nvim]]
+
+return require('packer').startup(function(use)
+    -- Packer can manage itself
+    use 'wbthomason/packer.nvim'
+
+    use {
+        'nvim-telescope/telescope.nvim', tag = '0.1.0',
+        -- or                            , branch = '0.1.x',
+        requires = { {'nvim-lua/plenary.nvim'} }
+    }
+
+    use { -- Theme inspired by Atom
+        'navarasu/onedark.nvim',
+        priority = 1000,
+        config = function()
+        vim.cmd.colorscheme 'onedark'
+        end
+    }
+
+end)
\ No newline at end of file
diff --git a/scripts/install.sh b/scripts/install.sh
index d232ecd..182275b 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -1,14 +1,24 @@
-sudo pacman -Syu
-sudo pacman -Sy rustup cmake neovim fish go xorg-xsetroot alacritty spotifyd neofetch discord vifm docker networkmanager-openvpn htop awesome-terminal-fonts ttf-jetbrains-mono gnome-keyring playerctl base-devel
+#!/bin/bash
 
+# Update and install base packages
+sudo pacman -Syu
+sudo pacman -Sy xorg-xsetroot alacritty awesome-terminal-fonts ttf-jetbrains-mono gnome-keyring playerctl # DE Setup
+sudo pacman -Sy neovim vifm neofetch fish htop networkmanager-openvpn unzip ripgrep # Utilities 
+sudo pacman -Sy base-devel rustup go cmake docker   # Dev
+sudo pacman -Sy spotifyd discord # Userspace
+
+# Move relevant script and config files
 mv ../.xinitrc ~/.xinitrc
 mkdir ~/.dwm
 mv ./autostart.sh ~/.dwm/autostart.sh 
 
+# Change Shell
 chsh -s /usr/bin/fish
 
+# Install rust (Used for Lemurs)
 rustup install stable
 
+# Install AUR
 cd /opt
 sudo git clone https://aur.archlinux.org/yay.git
 sudo chown -R luke-else:users ./yay
@@ -18,9 +28,11 @@ makepkg -si
 
 cd ~
 
+# Install packages through AUR
 yay vscode
 yay brave
 
+# Install and Configure git elements
 mkdir ~/git
 cd ~/git 
 
@@ -32,24 +44,34 @@ git clone ssh://git@git.luke-else.co.uk:222/luke-else/dmenu.git
 git clone ssh://git@git.luke-else.co.uk:222/luke-else/dwmblocks.git
 git clone https://github.com/coastalwhite/lemurs
 
+# Install DWM
 cd dwm
 git checkout dwm-patched
 sudo make install
 cd ..
 
+# Install dmenu
 cd dmenu
 sudo make install
 cd ..
 
+# Install DWMBlocks
 cd dwmblocks
 sudo cp ./statusbar/* /usr/local/bin/
 sudo make install
 cd ..
 
+# Install Lemurs
 cd lemurs
 sudo chmod +x install.sh
 ./install.sh
 cd ..
 
+# Install Oh-My-FISH
 cd ~
-curl https://raw.githubusercontent.com/oh-my-fish/oh-my-fish/master/bin/install | fish
\ No newline at end of file
+curl https://raw.githubusercontent.com/oh-my-fish/oh-my-fish/master/bin/install | fish
+
+# Install Packer.nvim
+
+git clone --depth 1 https://github.com/wbthomason/packer.nvim\
+ ~/.local/share/nvim/site/pack/packer/start/packer.nvim
\ No newline at end of file