diff --git a/mirrorlist_pi b/mirrorlist_pi
index 6cafca5..4aeec22 100755
--- a/mirrorlist_pi
+++ b/mirrorlist_pi
@@ -1,77 +1,83 @@
-################################################################################
-################# Arch Linux mirrorlist generated by Reflector #################
-################################################################################
+#
+# Arch Linux ARM repository mirrorlist
+# Generated on 2018-03-23
+#
 
-# With:       reflector -c Germany -p http -p https --sort rate -n 0
-# When:       2018-06-04 15:53:24 UTC
-# From:       https://www.archlinux.org/mirrors/status/json/
-# Retrieved:  2018-06-04 15:49:16 UTC
-# Last Check: 2018-06-04 15:08:19 UTC
+## Geo-IP based mirror selection and load balancing
+Server = http://mirror.archlinuxarm.org/$arch/$repo
 
-Server = http://artfiles.org/archlinux.org/$repo/os/$arch
-Server = http://mirror.united-gameserver.de/archlinux/$repo/os/$arch
-Server = http://arch.jensgutermuth.de/$repo/os/$arch
-Server = http://ftp.wrz.de/pub/archlinux/$repo/os/$arch
-Server = http://mirror.orbit-os.com/archlinux/$repo/os/$arch
-Server = http://mirror.selfnet.de/archlinux/$repo/os/$arch
-Server = http://mirrors.n-ix.net/archlinux/$repo/os/$arch
-Server = http://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/$arch
-Server = http://archlinux.eu.mirror.zoidplex.net/$repo/os/$arch
-Server = http://arch.eckner.net/archlinux/$repo/os/$arch
-Server = http://mirror.thomaskilian.net/archlinux/$repo/os/$arch
-Server = http://mirror.ubrco.de/archlinux/$repo/os/$arch
-Server = http://mirrors.niyawe.de/archlinux/$repo/os/$arch
-Server = http://mirror.pseudoform.org/$repo/os/$arch
-Server = http://mirror.michael-eckert.net/archlinux/$repo/os/$arch
-Server = http://archlinux.honkgong.info/$repo/os/$arch
-Server = http://repo.itmettke.de/archlinux/$repo/os/$arch
-Server = http://archlinux.nullpointer.io/$repo/os/$arch
-Server = http://archlinux.thaller.ws/$repo/os/$arch
-Server = http://archlinux.mirror.iphh.net/$repo/os/$arch
-Server = http://mirror.f4st.host/archlinux/$repo/os/$arch
-Server = http://archlinux.thelinuxnetworx.rocks/$repo/os/$arch
-Server = http://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/$arch
-Server = http://mirror.23media.de/archlinux/$repo/os/$arch
-Server = http://mirror.hactar.xyz/$repo/os/$arch
-Server = https://arch.jensgutermuth.de/$repo/os/$arch
-Server = https://ftp.wrz.de/pub/archlinux/$repo/os/$arch
-Server = https://mirror.orbit-os.com/archlinux/$repo/os/$arch
-Server = https://arch.eckner.net/archlinux/$repo/os/$arch
-Server = https://mirror.metalgamer.eu/archlinux/$repo/os/$arch
-Server = https://mirror.bethselamin.de/$repo/os/$arch
-Server = https://mirror.netcologne.de/archlinux/$repo/os/$arch
-Server = https://archlinux.layer8.fail/$repo/os/$arch
-Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch
-Server = https://www.ratenzahlung.de/mirror/archlinux/$repo/os/$arch
-Server = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archlinux/$repo/os/$arch
-Server = https://mirrors.n-ix.net/archlinux/$repo/os/$arch
-Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
-Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch
-Server = https://archlinux.eu.mirror.zoidplex.net/$repo/os/$arch
-Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch
-Server = http://linux.rz.rub.de/archlinux/$repo/os/$arch
-Server = https://mirror.michael-eckert.net/archlinux/$repo/os/$arch
-Server = http://ftp.fau.de/archlinux/$repo/os/$arch
-Server = https://mirror.thomaskilian.net/archlinux/$repo/os/$arch
-Server = http://mirror.metalgamer.eu/archlinux/$repo/os/$arch
-Server = https://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/$arch
-Server = https://mirror.hactar.xyz/$repo/os/$arch
-Server = https://archlinux.nullpointer.io/$repo/os/$arch
-Server = http://mirror.gnomus.de/$repo/os/$arch
-Server = http://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/$arch
-Server = http://packages.oth-regensburg.de/archlinux/$repo/os/$arch
-Server = http://ftp.gwdg.de/pub/linux/archlinux/$repo/os/$arch
-Server = https://archlinux.thaller.ws/$repo/os/$arch
-Server = https://archlinux.thelinuxnetworx.rocks/$repo/os/$arch
-Server = http://ftp.uni-bayreuth.de/linux/archlinux/$repo/os/$arch
-Server = https://repo.itmettke.de/archlinux/$repo/os/$arch
-Server = https://ftp.fau.de/archlinux/$repo/os/$arch
-Server = https://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch
-Server = http://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/$arch
-Server = https://packages.oth-regensburg.de/archlinux/$repo/os/$arch
-Server = https://mirror.fra10.de.leaseweb.net/archlinux/$repo/os/$arch
-Server = http://mirror.fra10.de.leaseweb.net/archlinux/$repo/os/$arch
-Server = https://mirror.pseudoform.org/$repo/os/$arch
-Server = http://www.gutscheindrache.com/mirror/archlinux/$repo/os/$arch
-Server = https://mirror.jankoppe.de/archlinux/$repo/os/$arch
+### Mirrors by country
 
+### Australia (not Austria!)
+## Sydney
+# Server = http://au.mirror.archlinuxarm.org/$arch/$repo
+
+### Brazil
+## Sao Paulo
+# Server = http://br2.mirror.archlinuxarm.org/$arch/$repo
+
+### Denmark
+## Aalborg
+# Server = http://dk.mirror.archlinuxarm.org/$arch/$repo
+
+### Finland
+## Tampere
+# Server = http://fi.mirror.archlinuxarm.org/$arch/$repo
+
+### France
+## Ain
+# Server = http://fr.mirror.archlinuxarm.org/$arch/$repo
+
+### Germany
+## Aachen
+# Server = http://de3.mirror.archlinuxarm.org/$arch/$repo
+## Berlin
+# Server = http://de.mirror.archlinuxarm.org/$arch/$repo
+## Coburg
+# Server = http://de4.mirror.archlinuxarm.org/$arch/$repo
+## Falkenstein
+# Server = http://de5.mirror.archlinuxarm.org/$arch/$repo
+# Server = http://de6.mirror.archlinuxarm.org/$arch/$repo
+## Nuremberg
+# Server = http://eu.mirror.archlinuxarm.org/$arch/$repo
+
+### Greece
+## Athens
+# Server = http://gr.mirror.archlinuxarm.org/$arch/$repo
+
+### Hungary
+## Budapest
+# Server = http://hu.mirror.archlinuxarm.org/$arch/$repo
+
+### Netherlands
+## Amsterdam
+# Server = http://nl.mirror.archlinuxarm.org/$arch/$repo
+
+### Russia
+## Moscow
+# Server = http://ru.mirror.archlinuxarm.org/$arch/$repo
+
+### Singapore
+# Server = http://sg.mirror.archlinuxarm.org/$arch/$repo
+
+### South Africa
+## Johannesburg
+# Server = https://za.mirror.archlinuxarm.org/$arch/$repo
+
+### Taiwan
+## New Taipei City
+# Server = http://tw.mirror.archlinuxarm.org/$arch/$repo
+
+### United States
+## California
+# Server = http://ca.us.mirror.archlinuxarm.org/$arch/$repo
+## Florida
+# Server = http://fl.us.mirror.archlinuxarm.org/$arch/$repo
+## Illinois
+# Server = http://il.us.mirror.archlinuxarm.org/$arch/$repo
+## Michigan
+# Server = http://mi.us.mirror.archlinuxarm.org/$arch/$repo
+
+### Vietnam
+## Da Nang
+# Server = http://vn.mirror.archlinuxarm.org/$arch/$repo
diff --git a/pacman.conf_pi b/pacman.conf_pi
index a720f7c..e74f4f3 100755
--- a/pacman.conf_pi
+++ b/pacman.conf_pi
@@ -16,13 +16,11 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -4 -v -C - -f %u > %o
-#XferCommand = /usr/bin/wget -4 --passive-ftp -c -t 0 -O %o %u
-#XferCommand = /usr/bin/snarf -N %u
-#XferCommand = /usr/bin/aria2c --allow-overwrite=true --continue=true --file-allocation=none --log-level=error --max-tries=2 --max-connection-per-server=2 --max-file-not-found=5 --min-split-size=5M --no-conf --remote-time=true --summary-interval=60 --timeout=5 --dir=/ --out %o %u
+#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
+Architecture = armv7h
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
@@ -33,20 +31,25 @@ Architecture = auto
 
 # Misc options
 #UseSyslog
-Color
+#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    = Never
-LocalFileSigLevel = Optional
-RemoteFileSigLevel = Never
-
-# 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`.
+# PGP signature checking
+# NOTE: None of this will work without running `pacman-key --init` first.
+# The compiled in default is equivalent to the following line. This requires
+# you to locally sign and trust packager keys using `pacman-key` for them to be
+# considered valid.
+#SigLevel    = Required DatabaseOptional
+#LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+# If you wish to check signatures but avoid local sign and trust issues, use
+# the following line. This will treat any key imported into pacman's keyring as
+# trusted.
+#SigLevel = Optional TrustAll
+# For now, off by default unless you read the above.
+SigLevel = Never
 
 #
 # REPOSITORIES
@@ -71,32 +74,24 @@ RemoteFileSigLevel = Never
 # 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_pi
+Include = /etc/pacman.d/mirrorlist
 
 [extra]
-Include = /etc/pacman.d/mirrorlist_pi
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
+Include = /etc/pacman.d/mirrorlist
 
 [community]
-Include = /etc/pacman.d/mirrorlist_pi
+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.
+[alarm]
+Include = /etc/pacman.d/mirrorlist
 
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist_pi
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist_pi
+[aur]
+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
+