diff --git a/.gitignore b/.gitignore
index 2fd738b..6c04234 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,11 @@
 /overlay
 !/overlay/x86_64
 !/overlay/i686
-!/overlay/etc/
+!/overlay/etc
+extra/templates/overlay
+!extra/templates/overlay/x86_64
+!extra/templates/overlay/i686
+!extra/templates/overlay/etc
 # The default doesn't store these in the git working dir,
 # but better safe than sorry.
 /root.x86_64
diff --git a/extra/aif.png b/extra/aif.png
new file mode 100644
index 0000000..9dd30ab
Binary files /dev/null and b/extra/aif.png differ
diff --git a/extra/pre-build.d/etc/locale.conf b/extra/pre-build.d/etc/locale.conf
index 4425391..c0d17cf 100644
--- a/extra/pre-build.d/etc/locale.conf
+++ b/extra/pre-build.d/etc/locale.conf
@@ -1,14 +1,14 @@
 LANG=en_US.UTF-8
-LC_CTYPE="en_US.UTF-8"
-LC_NUMERIC="en_US.UTF-8"
-LC_TIME="en_US.UTF-8"
-LC_COLLATE="en_US.UTF-8"
-LC_MONETARY="en_US.UTF-8"
-LC_MESSAGES="en_US.UTF-8"
-LC_PAPER="en_US.UTF-8"
-LC_NAME="en_US.UTF-8"
-LC_ADDRESS="en_US.UTF-8"
-LC_TELEPHONE="en_US.UTF-8"
-LC_MEASUREMENT="en_US.UTF-8"
-LC_IDENTIFICATION="en_US.UTF-8"
-LC_ALL=
+#LC_CTYPE="en_US.UTF-8"
+#LC_NUMERIC="en_US.UTF-8"
+#LC_TIME="en_US.UTF-8"
+#LC_COLLATE="en_US.UTF-8"
+#LC_MONETARY="en_US.UTF-8"
+#LC_MESSAGES="en_US.UTF-8"
+#LC_PAPER="en_US.UTF-8"
+#LC_NAME="en_US.UTF-8"
+#LC_ADDRESS="en_US.UTF-8"
+#LC_TELEPHONE="en_US.UTF-8"
+#LC_MEASUREMENT="en_US.UTF-8"
+#LC_IDENTIFICATION="en_US.UTF-8"
+#LC_ALL=
diff --git a/extra/pre-build.d/root/packages.both b/extra/pre-build.d/root/packages.both
index 14be6ba..5fb16db 100644
--- a/extra/pre-build.d/root/packages.both
+++ b/extra/pre-build.d/root/packages.both
@@ -280,6 +280,7 @@ stress
 sucrack
 symlinks
 sysstat
+systemd-sysvcompat
 tcpdump
 tcpslice
 tcptraceroute