diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6e92f57
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+tags
diff --git a/install b/install
index 7872c75..c7b0e94 100755
--- a/install
+++ b/install
@@ -1,6 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-mkdir -p $HOME/.local/bin
+mkdir -p "$HOME/.local/bin"
 
-cp scripts/* $HOME/.local/bin
-cp scripts/cron/* $HOME/.local/bin
+# If in the scripts folder ...
+if [[ $(pwd) == *"/scripts"* ]]; then
+    cp -r ./* "$HOME/.local/bin"
+else
+    cp -r ./scripts/* "$HOME/.local/bin"
+fi
diff --git a/install-system b/install-system
deleted file mode 100755
index 44feb69..0000000
--- a/install-system
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-sudo cp scripts/* /usr/local/bin
diff --git a/uninstall b/uninstall
new file mode 100755
index 0000000..842ee3a
--- /dev/null
+++ b/uninstall
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+for script in ./scripts/*; do
+	sudo rm "$HOME/.local/bin/$script"
+done
diff --git a/uninstall-system b/uninstall-system
deleted file mode 100755
index 56b7ee8..0000000
--- a/uninstall-system
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-scripts=$(ls scripts)
-
-for script in $scripts; do
-	sudo rm /usr/local/bin/$script
-done
diff --git a/update-voidrice b/update-voidrice
index a44b181..467bd9e 100755
--- a/update-voidrice
+++ b/update-voidrice
@@ -4,14 +4,11 @@
 # I use some of his scripts and although they don't often update, they are known to.
 # The output is going to include a bunch of copy errors as I'm just copying each file in this directory from his .local/bin back to here, obviously my custom scripts won't exist so they'll fail.
 
-scripts=$(ls scripts)
-crons=$(ls scripts/cron)
-
-for script in $scripts; do
-	cp ../voidrice/.local/bin/$script ./scripts/ -v
+for script in ./scripts/*; do
+	cp "../voidrice/.local/bin/$script" ./scripts/ -v
 done
 
 
-for cron in $crons; do
-	cp ../voidrice/.local/bin/cron/$cron ./scripts/cron/ -v
+for cron in ./scripts/cron/*; do
+	cp "../voidrice/.local/bin/cron/$cron" ./scripts/cron/ -v
 done