diff --git a/10-dpms.conf b/10-dpms.conf
new file mode 100644
index 0000000..95a6f8a
--- /dev/null
+++ b/10-dpms.conf
@@ -0,0 +1,14 @@
+
+Section "Monitor"
+	Identifier "eDP1"
+	Option "DPMS" "false"
+EndSection
+
+Section "ServerLayout"
+	Identifier "ServerLayout0"
+	Option "StandbyTime" "0"
+	Option "SuspendTime" "0"
+	Option "OffTime"     "0"
+	Option "BlankTime"   "0"
+EndSection
+
diff --git a/20-inteltearfree.conf b/20-inteltearfree.conf
deleted file mode 100644
index d2724c8..0000000
--- a/20-inteltearfree.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-Section "Device"
-	Identifier	"Intel Graphics
-	Driver		"intel"
-	Option		"TearFree" "true"
-EndSection 
diff --git a/PKGBUILD b/PKGBUILD
index 186eff4..78bbb04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,74 +6,60 @@ arch=(any)
 url="git.archlinux.org/tl-config"
 license=('none')
 groups=()
-depends=('pacaur'
-	'git'
-	'openssh'
-	'mosh'
-	'chromium'
-	'chromium-widevine'
-	'i3'
-	'3lock'
-	'dmenu'
-	'germinal'
-	'tmux'
-	'vifm'
-	'vcsh'
-	'htop'
-	'nmap'
-	'pkgfile'
+depends=(
+	# System setup
+	'intel-ucode'
+	# Non-graphical utils
+	'tmux' 'htop' 'vim'
+	'openssh' 'mosh' 'sshuttle'
+	'pacaur' 'git' 'pkgfile'
+	'pv' 'unzip' 'rsync'
+	'arch-install-scripts' 'bash-completion' 'reflector'
+	'alsa-utils'
+	# Non-graphical environment
+	'vifm' 'vcsh' 
 	'pass'
-	'vim'
-	'noto-fonts'
-	'noto-fonts-emoji'
-	'noto-fonts-cjk'
-	'numlockx'
-	'openvpn'
-	'pbpst'
-	'pv'
-	'scrot'
-	'srandrd'
-	'ttf-dejavu'
-	'ttf-indic-otf'
-	'ttf-liberation'
-	'ttf-symbola'
 	'vim-systemd'
-	'vte3-ng'
-	'xautolock'
-	'xclip'
-	'xdotool')
+	# Non-graphical Apps
+	'nmap' 'openvpn'
+	'pbpst' 'fb-client' 'shellcheck'
+	'android-tools' 'android-udev'
+	# Graphical/X environment
+	'xorg' 'xorg-server-utils' 'xorg-xinit'
+	'numlockx' 'xautolock' 'srandrd'
+	'i3' 'i3lock' 'i3status' 'dmenu' 'light' 
+	'arc-gtk-theme' 'pulseaudio' 'pulseaudio-alsa'
+	# Fonts
+	'ttf-dejavu' 'ttf-indic-otf' 'ttf-liberation' 'ttf-symbola'
+	'noto-fonts' 'noto-fonts-emoji' 'noto-fonts-cjk' 
+	# Graphical Utilities
+	'st' 'xclip' 'xdotool' 'xorg-apps'
+	'pavucontrol'
+	# Graphical Apps
+	'chromium' 'chromium-widevine'
+	'mpv' 'youtube-dl'
+	'deluge'
+	)
 makedepends=()
 checkdepends=()
 optdepends=()
-provides=()
+provides=('tl-archconfig')
 conflicts=()
 replaces=()
 backup=()
 options=()
 install=
 changelog=
-source=("$pkgname-$pkgver.tar.gz"
-        "$pkgname-$pkgver.patch")
+source=("10-dpms.conf"
+	"50-synaptics.conf"
+	"mirrorupgrade.hook"
+	)
 noextract=()
 md5sums=()
 
-prepare() {
-	cd "$pkgname-$pkgver"
-	patch -p1 -i "$srcdir/$pkgname-$pkgver.patch"
-}
-
-build() {
-	cd "$pkgname-$pkgver"
-	./configure --prefix=/usr
-	make
-}
-
-check() {
-	cd "$pkgname-$pkgver"
-	make -k check
-}
-
 package() {
-	cd "$pkgname-$pkgver"
 	make DESTDIR="$pkgdir/" install
+	install -D -o root -m 644 10-dpms.conf /etc/X11/xorg.conf.d/10-dpms.conf
+	install -D -o root -m 644 50-synaptics.conf /etc/X11/xorg.conf.d/50-synaptics.conf
+	install -D -o root -m 644 mirrorupgrade.hook /etc/pacman.d/hooks/mirrorupgrade.hook
 }
diff --git a/mirrorupgrade.hook b/mirrorupgrade.hook
new file mode 100644
index 0000000..e8c2021
--- /dev/null
+++ b/mirrorupgrade.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Operation = Upgrade
+Type = Package
+Target = pacman-mirrorlist
+
+[Action]
+Description = Updating pacman-mirrorlist with reflector and removing pacnew...
+When = PostTransaction
+Depends = reflector
+Exec = /usr/bin/env sh -c "reflector --country 'United States' --latest 200 --age 24 --sort rate --save /etc/pacman.d/mirrorlist; if [[ -f /etc/pacman.d/mirrorlist.pacnew ]]; then rm /etc/pacman.d/mirrorlist.pacnew; fi"
diff --git a/pacman.conf b/pacman.conf
deleted file mode 100644
index d9906ce..0000000
--- a/pacman.conf
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# /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 = KeepInstalled
-#UseDelta    = 0.7
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-Color
-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