diff --git a/.scripts/vimplugin.sh b/.scripts/vimplugin.sh
index fc1b094..c05e405 100755
--- a/.scripts/vimplugin.sh
+++ b/.scripts/vimplugin.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #----
-BASE="/etc/vim/pack"
+BASE="/usr/share/vim/vimfiles/pack"
 #----
 DIR="$BASE/plugins"
 LIST="$BASE/list"
@@ -9,143 +9,143 @@ START="$DIR/start"
 OPT="$DIR/opt"
 
 help() {
-    BOLD=$(tput bold)
-    NORMAL=$(tput sgr0)
-
-    echo "${BOLD}NAME${NORMAL}"
-    echo "        vimplugin - vim plugin manager"
-    echo ""
-    echo "${BOLD}SYNOPSIS${NORMAL}"
-    echo "        ./vimplugin.sh <command> [<arg1> <arg2>]"
-    echo ""
-    echo "${BOLD}COMMANDS${NORMAL}"
-    echo "        init"
-    echo "                Creates all the required directories/files."
-    echo ""
-    echo "        install <url> [\"start\"/\"opt\"]"
-    echo "                Install a new plugin, <url> need to be a valid \
+	BOLD=$(tput bold)
+	NORMAL=$(tput sgr0)
+
+	echo "${BOLD}NAME${NORMAL}"
+	echo "        vimplugin - vim plugin manager"
+	echo ""
+	echo "${BOLD}SYNOPSIS${NORMAL}"
+	echo "        ./vimplugin.sh <command> [<arg1> <arg2>]"
+	echo ""
+	echo "${BOLD}COMMANDS${NORMAL}"
+	echo "        init"
+	echo "                Creates all the required directories/files."
+	echo ""
+	echo "        install <url> [\"start\"/\"opt\"]"
+	echo "                Install a new plugin, <url> need to be a valid \
 GitHub URL,
                 start/opt to install the plugin in the start/opt directory \
 (default: start)."
-    echo ""
-    echo "        list <number>"
-    echo "                Prints all the installed plugins, <number> prints \
+	echo ""
+	echo "        list <number>"
+	echo "                Prints all the installed plugins, <number> prints \
 just the plugin in that position."
-    echo "        remove"
-    echo "                Remove plugin, script will prompt a selection menu."
-    echo "        update"
-    echo "                Installs/updates all plugins from the config file."
-    echo ""
+	echo "        remove"
+	echo "                Remove plugin, script will prompt a selection menu."
+	echo "        update"
+	echo "                Installs/updates all plugins from the config file."
+	echo ""
 }
 
 init() {
-    sudo mkdir -p $START
-    sudo mkdir -p $OPT
-    sudo touch $LIST
-    if [ ! -s $LIST ]; then
-        # Append to empty file
-        sudo sh -c 'echo "start:" >> '$LIST
-        sudo sh -c 'echo "opt:" >> '$LIST
-    fi
+	sudo mkdir -p $START
+	sudo mkdir -p $OPT
+	sudo touch $LIST
+	if [ ! -s $LIST ]; then
+		# Append to empty file
+		sudo sh -c 'echo "start:" >> '$LIST
+		sudo sh -c 'echo "opt:" >> '$LIST
+	fi
 }
 
 list() {
-    if [ -z "$1" ]; then
-        echo "Listing all installed plugins.."
-    fi
-
-    PLUGIN="$(find $DIR -mindepth 2 -maxdepth 2 \
-        | sort | awk -F '/' '{ print $(NF-1)"/"$NF }')"
-    NUM=0
-    for p in $PLUGIN; do
-        NUM=$(( NUM + 1 ))
-        
-        if [ -z "$1" ]; then
-            echo "$NUM) $p"
-        elif [ "$NUM" = "$1" ]; then
-            echo "$p"
-        fi
-    done
+	if [ -z "$1" ]; then
+		echo "Listing all installed plugins.."
+	fi
+
+	PLUGIN="$(find $DIR -mindepth 2 -maxdepth 2 \
+		| sort | awk -F '/' '{ print $(NF-1)"/"$NF }')"
+	NUM=0
+	for p in $PLUGIN; do
+		NUM=$(( NUM + 1 ))
+
+		if [ -z "$1" ]; then
+			echo "$NUM) $p"
+		elif [ "$NUM" = "$1" ]; then
+			echo "$p"
+		fi
+	done
 }
 
 install() {
-    # Check if correct git URL
-    if [ -z "$(echo $1 | sed -nr \
-        's/^https:\/\/github\.com\/(.*\/.*).git$/\1/p')" ]; then
-        echo "script: url invalid: $1"
-    else    
-        # cd to correct directory if called from the CLI
-        if [ -z "$2" ]; then
-            # Default is directory 'start'
-            cd "$START"
-        elif [ "$2" = "start" ]; then
-            cd "$START"
-        elif [ "$2" = "opt" ]; then
-            cd "$OPT"
-        fi
-
-        REPO="$(basename $1 .git)"
-        if [ -d "$REPO" ]; then
-            cd "$REPO"
-            sudo git pull --force 1> /dev/null
-            cd ".."
-            echo "Updated: $REPO"
-        else
-            sudo git clone "$1" 2> /dev/null
-
-            # Add git URL to config file
-            if [ -z "$2" ]; then
-                # Append before 'opt:'
-                sudo sed -i '/opt:/ i '$1 $LIST
-            elif [ "$2" = "start"  ]; then
-                # Append before 'opt:'
-                sudo sed -i '/opt:/ i '$1 $LIST
-            elif [ "$2" = "opt" ]; then
-                # Append at the end of the file
-                sudo sed -i '$ a '$1 $LIST
-            fi
-            
-            echo "Installed: $REPO"
-        fi
-    fi
+	# Check if correct git URL
+	if [ -z "$(echo $1 | sed -nr \
+		's/^https:\/\/github\.com\/(.*\/.*).git$/\1/p')" ]; then
+		echo "script: url invalid: $1"
+	else
+		# cd to correct directory if called from the CLI
+		if [ -z "$2" ]; then
+			# Default is directory 'start'
+			cd "$START"
+		elif [ "$2" = "start" ]; then
+			cd "$START"
+		elif [ "$2" = "opt" ]; then
+			cd "$OPT"
+		fi
+
+		REPO="$(basename $1 .git)"
+		if [ -d "$REPO" ]; then
+			cd "$REPO"
+			sudo git pull --force 1> /dev/null
+			cd ".."
+			echo "Updated: $REPO"
+		else
+			sudo git clone "$1" 2> /dev/null
+
+			# Add git URL to config file
+			if [ -z "$2" ]; then
+				# Append before 'opt:'
+				sudo sed -i '/opt:/ i '$1 $LIST
+			elif [ "$2" = "start"  ]; then
+				# Append before 'opt:'
+				sudo sed -i '/opt:/ i '$1 $LIST
+			elif [ "$2" = "opt" ]; then
+				# Append at the end of the file
+				sudo sed -i '$ a '$1 $LIST
+			fi
+
+			echo "Installed: $REPO"
+		fi
+	fi
 }
 
 update() {
-    echo "Updating.."
-
-    init
-
-    cd $START
-    while read l; do
-        if [ "$l" = "start:"  ]; then
-            cd "$START"
-        elif [ "$l" = "opt:"  ]; then
-            cd "$OPT"
-        else
-            install $l "script"
-        fi
-    done < $LIST
+	echo "Updating.."
+
+	init
+
+	cd $START
+	while read l; do
+		if [ "$l" = "start:"  ]; then
+			cd "$START"
+		elif [ "$l" = "opt:"  ]; then
+			cd "$OPT"
+		else
+			install $l "script"
+		fi
+	done < $LIST
 }
 
 remove() {
-    list
-    echo -n "Enter the number to remove: "
-    read OPTION
-
-    if [ -z "$(echo $OPTION | sed -nr 's/^([0-9]+)$/\1/p')" ]; then
-        echo "Please select a number"
-    else
-        TO_REMOVE="$(list $OPTION)"
-        if [ -n "$TO_REMOVE" ]; then
-            sudo rm -rf $DIR/$TO_REMOVE
-            sudo sed -i '/'"$(basename $TO_REMOVE)"'\.git/d' $LIST
-        fi
-    fi
+	list
+	echo -n "Enter the number to remove: "
+	read OPTION
+
+	if [ -z "$(echo $OPTION | sed -nr 's/^([0-9]+)$/\1/p')" ]; then
+		echo "Please select a number"
+	else
+		TO_REMOVE="$(list $OPTION)"
+		if [ -n "$TO_REMOVE" ]; then
+			sudo rm -rf $DIR/$TO_REMOVE
+			sudo sed -i '/'"$(basename $TO_REMOVE)"'\.git/d' $LIST
+		fi
+	fi
 }
 
 if type "$1" 2> /dev/null | grep -q "function"; then
-    "$@"
+	"$@"
 else
-    echo "script: command not found: $1"
+	echo "script: command not found: $1"
 fi
 
diff --git a/usr/share/vim/vimfiles/colors/hybrid_reverse.vim b/usr/share/vim/vimfiles/colors/hybrid_reverse.vim
index 9a20194..73dfbd8 120000
--- a/usr/share/vim/vimfiles/colors/hybrid_reverse.vim
+++ b/usr/share/vim/vimfiles/colors/hybrid_reverse.vim
@@ -1 +1 @@
-/etc/vim/pack/plugins/opt/vim-hybrid-material/colors/hybrid_reverse.vim
\ No newline at end of file
+/usr/share/vim/vimfiles/pack/plugins/opt/vim-hybrid-material/colors/hybrid_reverse.vim
\ No newline at end of file
diff --git a/etc/vim/pack/list b/usr/share/vim/vimfiles/pack/list
similarity index 100%
rename from etc/vim/pack/list
rename to usr/share/vim/vimfiles/pack/list