diff --git a/Admin/LICENSE b/Admin/LICENSE
deleted file mode 100644
index 878d895..0000000
--- a/Admin/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-# http://www.wtfpl.net/about/
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
-
-                        ANINIX ADDENDUM
-
- Trademark Pending 2017 (https://aninix.net/irc/)
- 
- The "AniNIX" name and |> logo is trademark-pending as of 2017. All
- AniNIX materials can be reproduced and re-used, though you must
- contact the admins of the network to get written permission to use
- the AniNIX name. 
-
- Attribution is appreciated for other materials but not legally
- required or necessary.
diff --git a/Admin/Makefile b/Admin/Makefile
deleted file mode 100644
index a732e26..0000000
--- a/Admin/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-LIST=arch-update close-guest fix-sound log-guest open-guest restart-service silent-guardian revproxy simple-web wifi wifiboot
-LOCATION=${pkgbuild}/root/bin
-INSTALLER != curl -s https://aninix.net/foundation/installer-test.bash | bash
-PERMISSION=0700
-
-compile: ${LIST} ./wifi.service
-	@echo Nothing to compile.
-
-install: compile 
-	mkdir -p ${LOCATION};
-	mkdir -p ${pkgbuild}/var/log/aninix/
-	for i in ${LIST}; do cp ./$$i ${LOCATION}; done
-	cp ./wifi.service ${pkgbuild}/usr/lib/systemd/system/wifi.service
-	make checkperm
-
-reverse: 
-	for i in ${LIST}; do cp ${LOCATION}/$$i .; done
-	cp ${pkgbuild}/usr/lib/systemd/system/wifi.service .
-
-test: ${LIST}
-	for i in ${LIST}; do [ "$$(grep -c '#!/bin/bash' $$i)" -ne 1 ]; done
-
-checkperm:
-	for i in ${LIST}; do chown root:root ${LOCATION}/$$i; chmod ${PERMISSION} ${LOCATION}/$$i; done
-	chown root: ${pkgbuild}/usr/lib/systemd/system/wifi.service; 
-	chmod 0644 ${pkgbuild}/usr/lib/systemd/system/wifi.service
-
-clean:
-	@echo Nothing to do.
-
-diff:
-	count=0; for i in ${LIST}; do echo $$i; diff ./$$i ${LOCATION}/$$i; if [ $$? -ne 0 ]; then count=$$(( $$count + 1 )); fi; echo; done; echo Found $$count files to be different.
-
diff --git a/Admin/restart-service b/Admin/restart-service
deleted file mode 100755
index 152d1ee..0000000
--- a/Admin/restart-service
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-if [ "$1" == "" ]; then echo Need a service name ; exit; fi
-
-systemctl daemon-reload
-systemctl restart $1
-sleep 3
-systemctl status -l $1
diff --git a/Admin/wifi.service b/Admin/wifi.service
deleted file mode 100644
index db4aad7..0000000
--- a/Admin/wifi.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Wifi Connectivity Service
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-ExecStart=/root/bin/wifiboot
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/AdminScripts/Makefile b/AdminScripts/Makefile
new file mode 100644
index 0000000..4d0e229
--- /dev/null
+++ b/AdminScripts/Makefile
@@ -0,0 +1,28 @@
+list=arch-update close-guest fix-sound log-guest open-guest restart-service silent-guardian revproxy simple-web netcli
+location=${pkgdir}/usr/local/sbin
+perms=0700
+
+compile: ${list} 
+	@echo Nothing to compile.
+
+install: compile 
+	mkdir -p ${location};
+	for i in ${list}; do cp ./$$i ${location}; done
+	make checkperm
+
+reverse: 
+	for i in ${list}; do cp ${location}/$$i .; done
+	cp ${pkgdir}/usr/lib/systemd/system/wifi.service .
+
+test: ${list}
+	for i in ${list}; do [ "$$(grep -c '#!/bin/bash' $$i)" -ne 1 ]; done
+
+checkperm:
+	for i in ${list}; do chown root:root ${location}/$$i; chmod ${perms} ${location}/$$i; done
+
+clean:
+	@echo Nothing to do.
+
+diff:
+	count=0; for i in ${list}; do echo $$i; diff ./$$i ${location}/$$i; if [ $$? -ne 0 ]; then count=$$(( $$count + 1 )); fi; echo; done; echo Found $$count files to be different.
+
diff --git a/Admin/arch-update b/AdminScripts/arch-update
similarity index 85%
rename from Admin/arch-update
rename to AdminScripts/arch-update
index fe069e3..74d475f 100755
--- a/Admin/arch-update
+++ b/AdminScripts/arch-update
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+set -x 
 export logfile="/var/log/sysupdate.log"
 export tmpfile=/tmp/shadowarch-cowerfile
 unset apply
@@ -18,17 +19,21 @@ date > $logfile
 # Update
 echo == Updating Arch Packages == | tee -a $logfile
 if [ ! -z "$apply" ]; then
-    pacman -Syu 2>&1 | tee -a $logfile # I've been having troubles with this causing crashes while online.
+    pacman -Syu --force 2>&1 | tee -a $logfile # I've been having troubles with this causing crashes while online.
     # Hook for MediaWiki
-    if [ `grep $(date +%F) /var/log/pacman.log | grep -c mediawiki` -eq 1 ] && [ -d /usr/share/webapps/mediawiki ]; then
+    if [ `grep $(date +$F) /var/log/pacman.log | grep -c mediawiki` -eq 1 ] && [ -d /usr/share/webapps/mediawiki ]; then
         php /usr/share/webapps/mediawiki/maintenance/update.php | tee -a $logfile
         for i in `find /usr/share/webapps/ -maxdepth 1 -type d | grep mediawiki\-`; do
             rsync -avz --exclude images --exclude Images --exclude LocalSettings.php /usr/share/webapps/mediawiki/ "$i"
             php "$i"/maintenance/update.php
         done
     fi
+    # Hook for TT-RSS 
+    if [ `grep $(date +$F) /var/log/pacman.log | grep -c tt-rss` -eq 1 ] && [ -d /usr/share/webapps/tt-rss ]; hten
+        /usr/bin/runuser -u http -- /usr/bin/php /usr/share/webapps/tt-rss/update.php --update-schema
+    fi
     # Hook for Grimoire
-    if [ `grep $(date +%F) /var/log/pacman.log | grep -c 'upgraded postgresql '` -eq 1 ]; then
+    if [ `grep $(date +$F) /var/log/pacman.log | grep -c 'upgraded postgresql '` -eq 1 ]; then
         echo "Updating PostGreSQL databases" | tee -a $logfile
         #Clear old backups.
         rm -Rf /var/lib/postgres/olddata
@@ -76,7 +81,7 @@ echo | tee -a $logfile
 # Update AniNIX packages
 echo == Updating AniNIX Packages == | tee -a $logfile
 if [ ! -z "$apply" ]; then
-    for i in `find /usr/local/src/ -maxdepth 6 -type f -name config -exec egrep -l aninix\|foundation {} \; | sed 's#.git/config$##'`; do
+    for i in ; do #`find /usr/local/src/ -maxdepth 6 -type f -name config -exec egrep -l aninix\|foundation {} \; | sed 's#.git/config$##'`; do
         cd "$i"
         git pull
         make
@@ -96,5 +101,3 @@ pacman -Qdtq > /var/log/orphaned-packages.txt
 echo | tee -a $logfile
 date | tee -a $logfile
 printf '\n\n' | tee -a $logfile
-
-if [ -z "$apply" ]; then cat $logfile | mail -s "AniNIX::$(hostname) Update Candidates" sh1k0b4@gmail.com; fi
diff --git a/Admin/close-guest b/AdminScripts/close-guest
similarity index 100%
rename from Admin/close-guest
rename to AdminScripts/close-guest
diff --git a/Admin/fix-sound b/AdminScripts/fix-sound
similarity index 100%
rename from Admin/fix-sound
rename to AdminScripts/fix-sound
diff --git a/Admin/log-guest b/AdminScripts/log-guest
similarity index 100%
rename from Admin/log-guest
rename to AdminScripts/log-guest
diff --git a/Admin/netcli b/AdminScripts/netcli
similarity index 100%
rename from Admin/netcli
rename to AdminScripts/netcli
diff --git a/Admin/open-guest b/AdminScripts/open-guest
similarity index 100%
rename from Admin/open-guest
rename to AdminScripts/open-guest
diff --git a/AdminScripts/restart-service b/AdminScripts/restart-service
new file mode 100755
index 0000000..72f61ce
--- /dev/null
+++ b/AdminScripts/restart-service
@@ -0,0 +1,12 @@
+#!/bin/bash
+if [ "$1" == "" ]; then 
+    echo Usage: $0 '[service(s)...]'; 
+    exit 1;
+fi
+
+for i in $@; do
+systemctl daemon-reload
+systemctl restart $i
+sleep 3
+systemctl status -l $i | head -n 6
+done
diff --git a/Admin/revproxy b/AdminScripts/revproxy
similarity index 100%
rename from Admin/revproxy
rename to AdminScripts/revproxy
diff --git a/AdminScripts/shadowarch-sync b/AdminScripts/shadowarch-sync
new file mode 100644
index 0000000..8540e6f
--- /dev/null
+++ b/AdminScripts/shadowarch-sync
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# File: shadowarch-sync
+# 
+# Description: This file syncs the ShadowArch customization files over the ones created by other packages, like filesystem and pacman
+# 
+# Package: AniNIX::Foundation/ShadowArch
+# Copyright: WTFPL
+# 
+# Author: DarkFeather <darkfeather@aninix.net>
+
+rsync -avz /opt/aninix/ShadowArch/etc/ /etc/
diff --git a/Admin/silent-guardian b/AdminScripts/silent-guardian
similarity index 65%
rename from Admin/silent-guardian
rename to AdminScripts/silent-guardian
index d6d1d05..1e81b3d 100755
--- a/Admin/silent-guardian
+++ b/AdminScripts/silent-guardian
@@ -17,23 +17,14 @@ find /srv/http/* -type d -exec chmod 0750 {} \;
 fi;
 
 # Fix the media permissions
-if [ -f /usr/lib/systemd/system/yggdrasil.service ]; then
-    chown -R $DEPRIV:http /srv/yggdrasil
-    /usr/local/bin/yggdrasil-lock
-fi
+/usr/local/bin/yggdrasil-lock
+
 # fix the WolfPack results location
 if [ -x /usr/local/bin/wolfpack ]; then 
     find /srv/wolfpack -type d -exec chmod 0755 {} \;
     find /srv/wolfpack -type f -exec chmod 0644 {} \;
 fi
 
-# Seal the special directories.
-for i in $(ls -a /srv/yggdrasil/Digital_Library/ | egrep '^\.[a-zA-Z0-9]+$'); do    
-    chown $DEPRIV:$DEPRIV -R $i;
-    find $i -type f -exec chmod 0400 {} \;
-    find $i -type d -exec chmod 0500 {} \;
-done
-
 # Guard root
 chmod 0700 /root
 chown -R root:root /root
@@ -42,12 +33,6 @@ find /root -type d -exec chmod 0700 {} \;
 # Guard home directories
 chmod 0750 /home/*
 
-# Guard API's
-if [ -f /usr/local/bin/api-keys ]; then
-    chmod 0750 /usr/local/bin/api-keys
-    chown root:api /usr/local/bin/api-keys
-fi
-
 # Guard LDAP
 if [ -d /etc/openldap ]; then 
     chown ldap:ldap /var/lib/openldap/openldap-data/*
diff --git a/Admin/simple-web b/AdminScripts/simple-web
similarity index 100%
rename from Admin/simple-web
rename to AdminScripts/simple-web
diff --git a/EtcFiles/Makefile b/EtcFiles/Makefile
new file mode 100644
index 0000000..21d792a
--- /dev/null
+++ b/EtcFiles/Makefile
@@ -0,0 +1,46 @@
+httpRoot = ${pkgdir}/srv/http/aninix.net
+httpUser = http
+syncList = vimrc bashrc tmux.conf profile pacman.conf
+serviceList = tmux@.service ssh-agent@.service
+
+compile: ./shadowarch
+	@echo Nothing to compile
+
+install: compile
+	mkdir -p ${pkgdir}/opt/aninix/ShadowArch/etc/
+	mkdir -p ${pkgdir}/usr/lib/systemd/system
+	for i in ${syncList}; do cp "$$i" ${pkgdir}/opt/aninix/ShadowArch/etc/; done
+	for i in ${serviceList}; do cp "$$i" ${pkgdir}/usr/lib/systemd/system/"$$i"; done
+	cp -pr ./skel ${pkgdir}/opt/aninix/ShadowArch/etc
+
+repository: shadowarch ${httpRoot}
+	cp ./shadowarch ${httpRoot}
+
+checkperm: ${syncList}
+	printf "What is your deprivileged user? "; read user; chown -R ${user}:${user} .
+	if [ -f ${httpRoot}/shadowarch ]; then chmod 0755 ${httpRoot}/shadowarch; chown ${httpUser} ${httpRoot}/shadowarch; fi
+	chown -R root:root ${syncList}
+	for i in ${syncList}; do if [ -f "${i}" ]; then chmod 0644 "${i}"; elif [ -d "${i}" ]; then chmod 0755 "${i}"; fi; done
+
+test: 
+	bash -n shadowarch
+	bash ./shadowarch -h 
+	echo Success.
+
+reverse: ${httpRoot}/shadowarch ${syncList}
+	cat ${httpRoot}/shadowarch > ./shadowarch
+	for i in ${syncList}; do rsync -avz ${syncList} .; done
+	for i in ${serviceList}; do rsync -avz ${serviceList} .; done
+	rsync --delete-before -avz ${pkgdir}/opt/aninix/ShadowArch/etc/skel ./skel
+
+clean:
+	@echo Nothing to do.
+
+diff: ${syncList}
+	if [ -f ${httpRoot}/shadowarch ]; then diff ./shadowarch ${httpRoot}/shadowarch; echo; fi
+	for i in ${syncList}; do diff -rc "$$i" ./`echo $$i | rev | cut -f 1 -d '/' | rev`; echo; done
+	diff -rc ${pkgdir}/opt/aninix/ShadowArch/etc/skel ./skel; printf ""
+
+find-missing-hooks-in-src:
+	@for i in `wget -q -O - https://aninix.net/foundation/ | grep toplevel-repo | cut -f 4 -d \'`; do if [ -z $$i ]; then continue; fi; for file in `find ../.. -type f -name Makefile | grep $$i`; do if [ -z "$$file" ]; then echo NO MAKEFILE FOR $$i; elif [ `grep -c -i 'hook for systemd' $$file` -eq 0 ]; then echo HOOK MISSING IN: $$file; else echo HOOK FOUND IN: $$file; fi; done; done
+	@for i in `wget -q -O - https://aninix.net/foundation/ | grep toplevel-repo | cut -f 4 -d \'`; do if [ -z $$i ]; then continue; fi; for file in `find ../.. -type f -name Makefile | grep $$i`; do if [ -z "$$file" ]; then echo NO MAKEFILE FOR $$i; elif [ `grep -c useradd $$file` -eq 0 ]; then echo DEPRIV MISSING IN: $$file; else echo DEPRIV FOUND IN: $$file; fi; done; done
diff --git a/ShadowArch/bashrc b/EtcFiles/bashrc
similarity index 73%
rename from ShadowArch/bashrc
rename to EtcFiles/bashrc
index 2856ac2..0c4a7a0 100644
--- a/ShadowArch/bashrc
+++ b/EtcFiles/bashrc
@@ -5,11 +5,11 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-PS1='\[\033[00;31m\][ AniNIX::\h(\[\033[01;32m\]`uname -o`\[\033[00;31m\]) \[\033[00;36m\]\u \[\033[01;37m\]\d \t \[\033[00;35m\]\w\[\033[00;31m\] ] \n|\[\033[m\]> '
+organization="$(hostname | rev | cut -f 2 -d '.' | rev)"
+PS1='\[\033[00;31m\][ '"${org^^}"'::\h/\[\033[01;32m\]\u \[\033[00;31m\]\\\\\\\\ ${SHELL} {\[\033[m\]$? \[\033[00;36m\]\D{%F-%R} \[\033[00;35m\]\w\[\033[00;31m\]\[\033[00;31m\]} ]\n|\[\033[m\]> '
 PS2='> '
 PS3='> '
 PS4='+ '
-
 case ${TERM} in
     xterm*|rxvt*|Eterm|aterm|kterm|gnome*)
         PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;AniNIX::%s \134\134 %s in %s\007" "${HOSTNAME%%.*}" "${USER}" "${PWD/#$HOME/\~}"'
@@ -24,6 +24,7 @@ esac
 # https://bugs.archlinux.org/task/55841
 #[ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
 
+### MOTD ###
 [ -f /etc/bash.motd ] && cat /etc/bash.motd
 
 ### AniNIX Customizations ###
@@ -37,22 +38,25 @@ alias make-entrypoints="egrep '^[a-zA-Z0-9\-]*:' Makefile"
 if [ -x `which torsocks 2>/dev/null` ] && [ `systemctl status tor 2>/dev/null| grep -c running` -eq 1 ]; then
     alias tor-lynx="torsocks lynx https://check.torproject.org/"; 
 fi
-
 IFS="
 "
 
-# Irssi
-for i in `ls -d ~/.irssi-* 2>/dev/null`; do 
-    alias `echo $i | cut -f 2 -d '-' | tr '[:upper:]' '[:lower:]'`="irssi --home=$i"; 
-done
-
-# SSH
-for i in `egrep '^Host' ~/.ssh/config | cut -f 2 -d ' '`; do
-    alias "$i"="ssh $i";
-done
-
+### SSH ###
+# Aliases for hosts
+if [ -f ~/.ssh/config ]; then
+    for i in `egrep '^Host' ~/.ssh/config | grep -v \* | cut -f 2 -d ' '`; do
+        alias "$i"="ssh $i";
+    done
+fi
+# Tell shell about ssh-agent -- enable with 'systemctl enable ssh-agent@$USER.service'
+SSH_AGENT_PID="$(ps -feu "$USER" | grep -v grep | grep -m 1 ssh-agent | awk '{ print $2; }')"
+if [ -n "$SSH_AGENT_PID" ]; then
+    SSH_AUTH_SOCK="$(ls -1 /tmp/ssh-*/agent.$(( $SSH_AGENT_PID - 1 )))"
+    echo ssh-agent PID is $SSH_AGENT_PID
+fi
 # Set up screen/tmux safety nest by default for remote sessions
 if [ ! -z "$SSH_CLIENT" ]; then 
+    # Prefer tmux
    if [ -x "$(which tmux 2>/dev/null)" ] && [ -z "$TMUX" ]; then 
         if [ `tmux list-sessions | grep created | wc -l` -eq 0 ]; then
             exec tmux
@@ -62,6 +66,7 @@ if [ ! -z "$SSH_CLIENT" ]; then
             tmux list-sessions
         fi
         alias tat="exec tmux a -d -t"
+    # Fallback on Screen
     elif [ -x "$(which screen 2>/dev/null)" ] && [ "$TERM" != "screen" ]; then
         if [ `screen -list | grep -c 'Detached'` -eq 1 ]; then
             exec screen -r
@@ -72,7 +77,9 @@ if [ ! -z "$SSH_CLIENT" ]; then
         fi 
         alias sdr="screen -d -r"
     fi;
-elif [ `who -m | egrep "^$(whoami)" | awk '{ print $2; }' | egrep -c "^tty"` -eq 1 ] && [ -x /usr/sbin/startxfce4 ] && [ `pgrep -ac xinit` -eq 0 ]; then
+
+### XFCE4 ###
+elif [ `who -m | egrep "^$(whoami)" | awk '{ print $2; }' | egrep -c "^tty"` -eq 1 ] && [ -x /usr/sbin/startxfce4 ] && [ `pgrep -ac xinit` -eq 0 ] && [ `whoami` != 'root' ]; then
     exec startxfce4
 fi
 
diff --git a/EtcFiles/pacman.conf b/EtcFiles/pacman.conf
new file mode 100644
index 0000000..dd213ae
--- /dev/null
+++ b/EtcFiles/pacman.conf
@@ -0,0 +1,111 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+#HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+CleanMethod = KeepCurrent
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+IgnorePkg   = mediawiki postgresql postgresql-libs
+# IgnorePkg = postgresql postgresql-libs
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+Color
+ILoveCandy
+#TotalDownload
+CheckSpace
+#VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
+[aninix]
+SigLevel = Optional TrustAll
+Server = https://aninix.net/maat/
+
+[aur]
+SigLevel = Optional TrustAll
+Server = https://aninix.net/maat/aur/
+
diff --git a/ShadowArch/profile b/EtcFiles/profile
similarity index 75%
rename from ShadowArch/profile
rename to EtcFiles/profile
index 0d4d23a..104de54 100644
--- a/ShadowArch/profile
+++ b/EtcFiles/profile
@@ -29,10 +29,4 @@ unset TERMCAP
 # Man is much better than us at figuring this out
 unset MANPATH
 
-if /bin/bash -c "[[ $(tty) =~ \"/dev/tty\" ]]" &>/dev/null; then
-   whoami=`whoami`
-   if [ `id | grep -c \(tty-allow\)` -ne 1 ] && [ `whoami` != "root" ];  then
-       exit
-   fi
-fi
 
diff --git a/ShadowArch/shadowarch b/EtcFiles/shadowarch
similarity index 98%
rename from ShadowArch/shadowarch
rename to EtcFiles/shadowarch
index 5429ecb..1c88b5c 100644
--- a/ShadowArch/shadowarch
+++ b/EtcFiles/shadowarch
@@ -150,13 +150,13 @@ fi
 
 # Install ArchLinux with basic clients for the AniNIX Services.
 # * git for Foundation
-# * lynx for WebServer and Wiki
+# * elinks for WebServer and Wiki
 # * openssh for SSH/SFTP
-# * irssi for IRC
+# * weechat for IRC
 # * make for source packages
 # * tor for anonymity
 header Installing ArchLinux to device\(s\) on /mnt
-export pkglist="base base-devel parted net-tools bind-tools git openssh make lynx irssi vim wget tor torsocks grub os-prober rsync openntpd tmux efibootmgr"
+export pkglist="base base-devel parted net-tools bind-tools git openssh make elinks weechat vim wget tor torsocks grub os-prober rsync openntpd tmux efibootmgr"
 if [ ! -z "$gui" ]; then 
     export pkglist="$pkglist"" xorg-server xfce4 chromium conky tigervnc xscreensaver"
 fi
@@ -164,7 +164,7 @@ if [ ! -z "$spartacus" ]; then
     export pkglist="$pkglist"" exfat-utils"
 fi
 if [ ! -z "$productivity" ]; then
-    export pkglist="$pkglist"" libreoffice-still gimp feh vlc evince"
+    export pkglist="$pkglist"" libreoffice-still gimp feh vlc evince openshot"
 fi
 if [ ! -z "$kali" ]; then
     export pkglist="$pkglist"" extundelete testdisk nmap tcpdump hexedit dcfldd"
diff --git a/ShadowArch/skel/.bash_logout b/EtcFiles/skel/.bash_logout
similarity index 100%
rename from ShadowArch/skel/.bash_logout
rename to EtcFiles/skel/.bash_logout
diff --git a/ShadowArch/skel/.bash_profile b/EtcFiles/skel/.bash_profile
similarity index 100%
rename from ShadowArch/skel/.bash_profile
rename to EtcFiles/skel/.bash_profile
diff --git a/ShadowArch/skel/.bashrc b/EtcFiles/skel/.bashrc
similarity index 100%
rename from ShadowArch/skel/.bashrc
rename to EtcFiles/skel/.bashrc
diff --git a/ShadowArch/skel/.config/autostart/conky.desktop b/EtcFiles/skel/.config/autostart/conky.desktop
similarity index 100%
rename from ShadowArch/skel/.config/autostart/conky.desktop
rename to EtcFiles/skel/.config/autostart/conky.desktop
diff --git a/ShadowArch/skel/.config/autostart/xscreensaver.desktop b/EtcFiles/skel/.config/autostart/xscreensaver.desktop
similarity index 100%
rename from ShadowArch/skel/.config/autostart/xscreensaver.desktop
rename to EtcFiles/skel/.config/autostart/xscreensaver.desktop
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1008x672.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1008x672.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1008x672.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1008x672.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1008x721.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1008x721.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1008x721.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1008x721.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1136x817.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1136x817.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1136x817.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1136x817.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1184x653.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1184x653.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1184x653.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1184x653.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1202x864.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1202x864.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1202x864.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1202x864.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1202x913.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1202x913.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1202x913.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1202x913.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1248x592.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1248x592.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1248x592.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1248x592.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1248x749.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1248x749.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1248x749.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1248x749.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x608.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x608.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x608.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x608.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x673.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x673.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x673.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x673.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x772.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x772.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x772.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x772.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x773.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x773.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x773.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x773.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x906.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x906.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x906.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x906.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x909.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x909.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x909.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x909.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x913.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x913.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x913.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x913.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x944.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x944.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x944.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x944.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x977.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x977.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1264x977.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1264x977.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1315x666.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1315x666.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1315x666.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1315x666.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1424x793.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1424x793.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1424x793.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1424x793.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1514x724.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1514x724.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1514x724.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1514x724.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1520x817.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1520x817.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1520x817.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1520x817.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1566x771.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1566x771.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1566x771.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1566x771.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1568x352.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1568x352.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1568x352.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1568x352.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1568x615.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1568x615.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1568x615.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1568x615.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1568x755.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1568x755.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1568x755.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1568x755.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1568x773.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1568x773.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1568x773.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1568x773.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1568x897.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1568x897.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1568x897.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1568x897.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x749.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x749.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x749.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x749.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x788.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x788.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x788.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x788.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x789.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x789.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x789.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x789.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x793.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x793.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x793.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x793.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x853.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x853.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x853.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x853.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x913.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x913.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x913.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x913.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x977.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x977.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1584x977.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1584x977.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x653.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x653.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x653.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x653.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x687.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x687.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x687.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x687.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x750.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x750.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x750.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x750.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x775.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x775.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x775.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x775.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x779.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x779.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x779.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x779.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x852.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x852.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x852.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x852.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x906.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x906.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x906.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x906.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x940.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x940.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x940.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x940.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x942.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x942.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1658x942.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1658x942.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1664x1003.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1664x1003.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1664x1003.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1664x1003.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1664x939.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1664x939.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1664x939.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1664x939.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1664x943.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1664x943.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1664x943.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1664x943.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1664x974.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1664x974.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1664x974.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1664x974.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1888x403.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1888x403.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1888x403.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1888x403.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1888x573.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1888x573.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1888x573.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1888x573.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1888x707.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1888x707.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1888x707.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1888x707.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1888x801.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1888x801.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1888x801.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1888x801.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1888x858.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1888x858.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1888x858.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1888x858.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x1033.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x1033.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x1033.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x1033.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x1064.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x1064.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x1064.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x1064.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x928.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x928.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x928.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x928.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x929.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x929.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x929.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x929.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x964.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x964.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x964.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x964.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x965.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x965.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x965.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x965.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x968.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x968.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x968.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x968.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x969.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x969.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-1904x969.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-1904x969.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-2384x1173.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-2384x1173.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-2384x1173.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-2384x1173.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-2384x1303.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-2384x1303.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-2384x1303.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-2384x1303.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-3504x1033.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-3504x1033.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-3504x1033.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-3504x1033.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-5086x607.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-5086x607.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-5086x607.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-5086x607.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-5104x1033.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-5104x1033.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-5104x1033.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-5104x1033.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-608x897.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-608x897.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-608x897.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-608x897.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-612x691.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-612x691.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-612x691.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-612x691.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-612x693.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-612x693.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-612x693.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-612x693.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-623x593.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-623x593.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-623x593.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-623x593.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-624x22.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-624x22.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-624x22.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-624x22.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-624x232.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-624x232.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-624x232.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-624x232.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-624x310.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-624x310.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-624x310.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-624x310.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-624x363.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-624x363.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-624x363.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-624x363.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-624x433.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-624x433.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-624x433.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-624x433.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-632x371.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-632x371.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-632x371.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-632x371.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-648x455.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-648x455.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-648x455.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-648x455.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-766x425.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-766x425.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-766x425.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-766x425.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-768x322.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-768x322.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-768x322.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-768x322.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-768x733.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-768x733.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-768x733.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-768x733.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-768x773.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-768x773.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-768x773.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-768x773.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-768x789.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-768x789.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-768x789.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-768x789.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-768x853.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-768x853.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-768x853.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-768x853.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-768x897.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-768x897.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-768x897.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-768x897.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-776x785.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-776x785.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-776x785.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-776x785.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-784x493.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-784x493.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-784x493.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-784x493.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-784x553.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-784x553.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-784x553.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-784x553.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-796x573.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-796x573.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-796x573.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-796x573.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-895x522.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-895x522.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-895x522.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-895x522.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-928x392.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-928x392.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-928x392.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-928x392.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-928x412.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-928x412.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-928x412.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-928x412.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-928x629.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-928x629.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-928x629.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-928x629.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-928x678.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-928x678.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-928x678.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-928x678.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-928x913.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-928x913.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-928x913.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-928x913.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-936x921.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-936x921.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-936x921.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-936x921.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-943x627.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-943x627.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-943x627.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-943x627.rc
diff --git a/ShadowArch/skel/.config/xfce4/desktop/icons.screen0-978x363.rc b/EtcFiles/skel/.config/xfce4/desktop/icons.screen0-978x363.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/desktop/icons.screen0-978x363.rc
rename to EtcFiles/skel/.config/xfce4/desktop/icons.screen0-978x363.rc
diff --git a/ShadowArch/skel/.config/xfce4/help.rc b/EtcFiles/skel/.config/xfce4/help.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/help.rc
rename to EtcFiles/skel/.config/xfce4/help.rc
diff --git a/ShadowArch/skel/.config/xfce4/helpers.rc b/EtcFiles/skel/.config/xfce4/helpers.rc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/helpers.rc
rename to EtcFiles/skel/.config/xfce4/helpers.rc
diff --git a/ShadowArch/skel/.config/xfce4/panel/launcher-10/13819053881.desktop b/EtcFiles/skel/.config/xfce4/panel/launcher-10/13819053881.desktop
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/panel/launcher-10/13819053881.desktop
rename to EtcFiles/skel/.config/xfce4/panel/launcher-10/13819053881.desktop
diff --git a/ShadowArch/skel/.config/xfce4/panel/launcher-10/13909659584.desktop b/EtcFiles/skel/.config/xfce4/panel/launcher-10/13909659584.desktop
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/panel/launcher-10/13909659584.desktop
rename to EtcFiles/skel/.config/xfce4/panel/launcher-10/13909659584.desktop
diff --git a/ShadowArch/skel/.config/xfce4/panel/launcher-11/14163596231.desktop b/EtcFiles/skel/.config/xfce4/panel/launcher-11/14163596231.desktop
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/panel/launcher-11/14163596231.desktop
rename to EtcFiles/skel/.config/xfce4/panel/launcher-11/14163596231.desktop
diff --git a/ShadowArch/skel/.config/xfce4/panel/launcher-7/13909659211.desktop b/EtcFiles/skel/.config/xfce4/panel/launcher-7/13909659211.desktop
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/panel/launcher-7/13909659211.desktop
rename to EtcFiles/skel/.config/xfce4/panel/launcher-7/13909659211.desktop
diff --git a/ShadowArch/skel/.config/xfce4/panel/launcher-7/14605891151.desktop b/EtcFiles/skel/.config/xfce4/panel/launcher-7/14605891151.desktop
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/panel/launcher-7/14605891151.desktop
rename to EtcFiles/skel/.config/xfce4/panel/launcher-7/14605891151.desktop
diff --git a/ShadowArch/skel/.config/xfce4/panel/launcher-7/14605891202.desktop b/EtcFiles/skel/.config/xfce4/panel/launcher-7/14605891202.desktop
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/panel/launcher-7/14605891202.desktop
rename to EtcFiles/skel/.config/xfce4/panel/launcher-7/14605891202.desktop
diff --git a/ShadowArch/skel/.config/xfce4/panel/launcher-8/13909659312.desktop b/EtcFiles/skel/.config/xfce4/panel/launcher-8/13909659312.desktop
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/panel/launcher-8/13909659312.desktop
rename to EtcFiles/skel/.config/xfce4/panel/launcher-8/13909659312.desktop
diff --git a/ShadowArch/skel/.config/xfce4/panel/launcher-9/13818980364.desktop b/EtcFiles/skel/.config/xfce4/panel/launcher-9/13818980364.desktop
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/panel/launcher-9/13818980364.desktop
rename to EtcFiles/skel/.config/xfce4/panel/launcher-9/13818980364.desktop
diff --git a/ShadowArch/skel/.config/xfce4/panel/launcher-9/13909659513.desktop b/EtcFiles/skel/.config/xfce4/panel/launcher-9/13909659513.desktop
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/panel/launcher-9/13909659513.desktop
rename to EtcFiles/skel/.config/xfce4/panel/launcher-9/13909659513.desktop
diff --git a/ShadowArch/skel/.config/xfce4/terminal/accels.scm b/EtcFiles/skel/.config/xfce4/terminal/accels.scm
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/terminal/accels.scm
rename to EtcFiles/skel/.config/xfce4/terminal/accels.scm
diff --git a/ShadowArch/skel/.config/xfce4/terminal/terminalrc b/EtcFiles/skel/.config/xfce4/terminal/terminalrc
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/terminal/terminalrc
rename to EtcFiles/skel/.config/xfce4/terminal/terminalrc
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
diff --git a/ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
similarity index 100%
rename from ShadowArch/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
rename to EtcFiles/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
diff --git a/ShadowArch/skel/.conkyrc b/EtcFiles/skel/.conkyrc
similarity index 100%
rename from ShadowArch/skel/.conkyrc
rename to EtcFiles/skel/.conkyrc
diff --git a/ShadowArch/skel/.gitconfig b/EtcFiles/skel/.gitconfig
similarity index 100%
rename from ShadowArch/skel/.gitconfig
rename to EtcFiles/skel/.gitconfig
diff --git a/ShadowArch/skel/.screenrc b/EtcFiles/skel/.screenrc
similarity index 100%
rename from ShadowArch/skel/.screenrc
rename to EtcFiles/skel/.screenrc
diff --git a/ShadowArch/skel/.ssh/config b/EtcFiles/skel/.ssh/config
similarity index 100%
rename from ShadowArch/skel/.ssh/config
rename to EtcFiles/skel/.ssh/config
diff --git a/EtcFiles/ssh-agent@.service b/EtcFiles/ssh-agent@.service
new file mode 100644
index 0000000..fe33c89
--- /dev/null
+++ b/EtcFiles/ssh-agent@.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=SSH-Agent for User %I
+After=network.target shadow.service
+
+[Service]
+ExecStart=/bin/bash -c "ssh-agent -s > /home/%I/.bashrc.ssh-agent"
+ExecReload=/bin/kill -HUP $MAINPID
+Type=oneshot
+KillMode=process
+Restart=on-failed
+User=%I
+Group=%I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ShadowArch/tmux.conf b/EtcFiles/tmux.conf
similarity index 77%
rename from ShadowArch/tmux.conf
rename to EtcFiles/tmux.conf
index c6b05c6..6706f24 100644
--- a/ShadowArch/tmux.conf
+++ b/EtcFiles/tmux.conf
@@ -1,7 +1,8 @@
 unbind C-z
+set -g status-bg red
 set-option -ga terminal-overrides ',*:enacs@:smacs@:rmacs@:acsc@'
 bind-key -T prefix X confirm-before -p "kill-pane #P? (y/n)" kill-pane
 bind-key -T prefix x new-window cryptoworkbench
-bind-key -T prefix b new-window lynx https://aninix.net/
+bind-key -T prefix b new-window elinks https://aninix.net/
 bind-key -T prefix s set status
 bind-key -T prefix S setw synchronize-panes
diff --git a/EtcFiles/tmux@.service b/EtcFiles/tmux@.service
new file mode 100644
index 0000000..7133a49
--- /dev/null
+++ b/EtcFiles/tmux@.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=TMUX/Weechat Session for User %I
+After=network.target shadow.service
+
+[Service]
+ExecStart=/usr/sbin/tmux new-session -d -c IRC weechat
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=on-failed
+Type=oneshot
+User=%I
+Group=%I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ShadowArch/vimrc b/EtcFiles/vimrc
similarity index 100%
rename from ShadowArch/vimrc
rename to EtcFiles/vimrc
diff --git a/Makefile b/Makefile
index f38ae1f..5ca3666 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-LIST=Admin Shared ShadowArch
+LIST=AdminScripts UserScripts EtcFiles
 
 compile: ${LIST}
 	for i in ${LIST}; do make -C ./$$i; done
@@ -16,8 +16,12 @@ checkperm:
 	@echo Please do this for each individual folder in ${LIST}
 
 clean:
-	@echo Nothing to do.
+	rm -Rf `cat .gitignore`
 
 diff:
 	@echo Please do this for each individual folder in ${LIST}
 
+localinstall: 
+	mkdir -p ~/bin/
+	for i in AdminScripts UserScripts; do cd $$i; for j in `ls -1 | grep -v Makefile`; do install -o ${USER} -m 0755 "$$j" /home/${USER}/bin/; done; cd ..; done
+	cd EtcFiles; for i in `ls -1 | egrep -v '*.service|skel|Makefile'`; do cp "$$i" /home/${USER}/."$$i"; done
diff --git a/PKGBUILD b/PKGBUILD
index f9fcedb..757a553 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,21 @@
 # Maintainer: Shikoba Kage <darkfeather@aninix.net>
-pkgname=aninix-misc-scripts
-pkgver=0.1.d2deb6bee364f1ad7480cb5d97ea74252c266032
+pkgname=shadowarch
+pkgver=0.1.deac12d
 pkgver() {
-    printf "0.1.""$(git rev-parse HEAD)"
+    printf "0.1.""$(git rev-parse --short HEAD)"
 }
 pkgrel=1
 epoch=
-pkgdesc="AniNIX::MiscScripts \\\\ Miscellaneous administrative and otherwise helpful scripts"
+pkgdesc="AniNIX::ShadowArch \\\\ AniNIX preferred shell environment"
 arch=("x86_64")
-url="https://aninix.net/foundation/MiscScripts"
+url="https://aninix.net/foundation/ShadowArch"
 license=('custom')
 groups=()
 depends=('curl' 'grep' 'bash>=4.4' 'git>=2.13')
 makedepends=('make>=4.2')
 checkdepends=()
 optdepends=()
-provides=('aninix-misc-scripts')
+provides=('shadowarch')
 conflicts=()
 replaces=()
 backup=()
diff --git a/ShadowArch/LICENSE b/ShadowArch/LICENSE
deleted file mode 100644
index 878d895..0000000
--- a/ShadowArch/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-# http://www.wtfpl.net/about/
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
-
-                        ANINIX ADDENDUM
-
- Trademark Pending 2017 (https://aninix.net/irc/)
- 
- The "AniNIX" name and |> logo is trademark-pending as of 2017. All
- AniNIX materials can be reproduced and re-used, though you must
- contact the admins of the network to get written permission to use
- the AniNIX name. 
-
- Attribution is appreciated for other materials but not legally
- required or necessary.
diff --git a/ShadowArch/Makefile b/ShadowArch/Makefile
deleted file mode 100644
index af0be86..0000000
--- a/ShadowArch/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-HTTPROOT = ${pkgbuild}/srv/http/aninix.net
-HTTPUSER = http
-SYNCLIST = ${pkgbuild}/etc/vimrc ${pkgbuild}/etc/bashrc ${pkgbuild}/etc/tmux.conf ${pkgbuild}/etc/profile
-INSTALLER != curl -s https://aninix.net/foundation/installer-test.bash | ${pkgbuild}/bin/bash
-
-compile: ./shadowarch
-	@echo Nothing to compile
-
-install: compile
-	for i in ${SYNCLIST}; do rsync -avz -r `echo $$i | sed 's#^/etc/##'` ${pkgbuild}$$i; done
-	mkdir -p ${pkgbuild}/etc
-	rm -Rf ${pkgbuild}/etc/skel; cp -pr ./skel ${pkgbuild}/etc
-	# This is a nicety.
-	if [ -f ${pkgbuild}/root/shadowarch* ]; then sed -i 's/`uname -o`/ShadowArch/g' ${pkgbuild}/etc/bashrc; fi
-
-repository: shadowarch ${HTTPROOT}
-	cp ./shadowarch ${HTTPROOT}
-
-checkperm: ${SYNCLIST}
-	printf "What is your deprivileged user? "; read user; chown -R ${user}:${user} .
-	if [ -f ${HTTPROOT}/shadowarch ]; then chmod 0755 ${HTTPROOT}/shadowarch; chown ${HTTPUSER} ${HTTPROOT}/shadowarch; fi
-	chown -R root:root ${SYNCLIST}
-	for i in ${SYNCLIST}; do if [ -f "${i}" ]; then chmod 0644 "${i}"; elif [ -d "${i}" ]; then chmod 0755 "${i}"; fi; done
-
-test: 
-	bash -n shadowarch
-	bash ./shadowarch -h 
-	echo Success.
-
-reverse: ${HTTPROOT}/shadowarch ${SYNCLIST}
-	cat ${HTTPROOT}/shadowarch > ./shadowarch
-	for i in ${SYNCLIST}; do rsync -avz ${SYNCLIST} .; done
-	rm -Rf ./skel; cp -pr ${pkgbuild}/etc/skel ./skel
-	sed -i 's/ShadowArch/`uname -o`/' ./bash.bashrc
-
-clean:
-	if [ -f ${pkgbuild}/etc/bash.bashrc ]; then printf "Remove ${pkgbuild}/etc/bash.bashrc? [y/n] "; read answer; if [ "$$answer" == "y" ]; then rm ${pkgbuild}/etc/bash.bashrc; fi; fi
-
-diff: ${SYNCLIST}
-	if [ -f ${HTTPROOT}/shadowarch ]; then diff ./shadowarch ${HTTPROOT}/shadowarch; echo; fi
-	for i in ${SYNCLIST}; do diff -rc "$$i" ./`echo $$i | rev | cut -f 1 -d '/' | rev`; echo; done
-	diff -rc ${pkgbuild}/etc/skel ./skel; printf ""
-
-find-missing-hooks-in-src:
-	@for i in `wget -q -O - https://aninix.net/foundation/ | grep toplevel-repo | cut -f 4 -d \'`; do if [ -z $$i ]; then continue; fi; for file in `find ../.. -type f -name Makefile | grep $$i`; do if [ -z "$$file" ]; then echo NO MAKEFILE FOR $$i; elif [ `grep -c -i 'hook for systemd' $$file` -eq 0 ]; then echo HOOK MISSING IN: $$file; else echo HOOK FOUND IN: $$file; fi; done; done
-	@for i in `wget -q -O - https://aninix.net/foundation/ | grep toplevel-repo | cut -f 4 -d \'`; do if [ -z $$i ]; then continue; fi; for file in `find ../.. -type f -name Makefile | grep $$i`; do if [ -z "$$file" ]; then echo NO MAKEFILE FOR $$i; elif [ `grep -c useradd $$file` -eq 0 ]; then echo DEPRIV MISSING IN: $$file; else echo DEPRIV FOUND IN: $$file; fi; done; done
diff --git a/Shared/LICENSE b/Shared/LICENSE
deleted file mode 100644
index 878d895..0000000
--- a/Shared/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-# http://www.wtfpl.net/about/
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
-
-                        ANINIX ADDENDUM
-
- Trademark Pending 2017 (https://aninix.net/irc/)
- 
- The "AniNIX" name and |> logo is trademark-pending as of 2017. All
- AniNIX materials can be reproduced and re-used, though you must
- contact the admins of the network to get written permission to use
- the AniNIX name. 
-
- Attribution is appreciated for other materials but not legally
- required or necessary.
diff --git a/Shared/Makefile b/UserScripts/Makefile
similarity index 100%
rename from Shared/Makefile
rename to UserScripts/Makefile
diff --git a/Shared/bell b/UserScripts/bell
similarity index 100%
rename from Shared/bell
rename to UserScripts/bell
diff --git a/Shared/bigorlittle b/UserScripts/bigorlittle
similarity index 100%
rename from Shared/bigorlittle
rename to UserScripts/bigorlittle
diff --git a/Shared/compare-directories b/UserScripts/compare-directories
similarity index 100%
rename from Shared/compare-directories
rename to UserScripts/compare-directories
diff --git a/Shared/compress-all b/UserScripts/compress-all
similarity index 100%
rename from Shared/compress-all
rename to UserScripts/compress-all
diff --git a/Shared/diff-args b/UserScripts/diff-args
similarity index 100%
rename from Shared/diff-args
rename to UserScripts/diff-args
diff --git a/Shared/expand-all b/UserScripts/expand-all
similarity index 100%
rename from Shared/expand-all
rename to UserScripts/expand-all
diff --git a/Shared/failcount b/UserScripts/failcount
similarity index 100%
rename from Shared/failcount
rename to UserScripts/failcount
diff --git a/Shared/logged-shell b/UserScripts/logged-shell
similarity index 100%
rename from Shared/logged-shell
rename to UserScripts/logged-shell
diff --git a/Shared/standardize-folder b/UserScripts/standardize-folder
similarity index 100%
rename from Shared/standardize-folder
rename to UserScripts/standardize-folder
diff --git a/Shared/sysinfo b/UserScripts/sysinfo
similarity index 100%
rename from Shared/sysinfo
rename to UserScripts/sysinfo
diff --git a/Shared/whatismyip b/UserScripts/whatismyip
similarity index 100%
rename from Shared/whatismyip
rename to UserScripts/whatismyip
diff --git a/Shared/worktrack b/UserScripts/worktrack
similarity index 100%
rename from Shared/worktrack
rename to UserScripts/worktrack