diff --git a/live_exam_os/Dockerfile b/live_exam_os/Dockerfile
index 4c9756fad80dc1688b93f79feca8125a46af142b..a68b853d6fe615600fdda0629eef6d7ed69a5d23 100644
--- a/live_exam_os/Dockerfile
+++ b/live_exam_os/Dockerfile
@@ -26,8 +26,6 @@ ARG cert
ARG exam_user
ARG exam_pwd
-COPY --from=nexus-exam-builder /nexus/build/nexus-exam config/
-
RUN apt-get update && apt-get install -y \
live-build \
live-config \
@@ -35,77 +33,68 @@ RUN apt-get update && apt-get install -y \
WORKDIR /live-default
-## Add live-cd additionnal packages
-ADD config/packages.list.chroot config/package-lists/
+# Install grub config
+ADD config/00-bootloader/grub_config.cfg config/includes.binary/boot/grub/config.cfg
-## Packages to be removed
-ADD config/9999-removepkg.hook.chroot config/hooks/live/
+## Add additionnal Debian packages
+ADD config/01-build_hooks/packages.list.chroot config/package-lists/
## Add swiss-french keyboard config
-ADD config/keyboard/keyboard config/includes.chroot/etc/default/
+ADD config/01-build_hooks/keyboard/keyboard config/includes.chroot/etc/default/
+
+# Install wifi connection
+ADD config/01-build_hooks/wifi/wifi.nmconnection config/includes.chroot/etc/NetworkManager/system-connections/
+RUN chmod 0600 config/includes.chroot/etc/NetworkManager/system-connections/wifi.nmconnection
-## Run "nexus-exam" as soon as user logs in
-ADD config/nexus-exam config/includes.chroot/usr/local/bin/
-ADD config/nexus-exam.desktop config/includes.chroot/etc/xdg/autostart/
+## Specify groups for live user (dialout is required to access serial interfaces)
+# RUN mkdir -p config/includes.chroot/etc/live/config.conf.d
+# RUN echo "LIVE_USER_DEFAULT_GROUPS=\"cdrom floppy sudo audio dip video plugdev users netdev bluetooth scanner dialout\"" > config/includes.chroot/etc/live/config.conf.d/10-user-setup.conf
+
+## Copy nexus-exam from builder container
+COPY --from=nexus-exam-builder /nexus/build/nexus-exam config/includes.chroot/usr/local/bin/
+## Run nexus-exam as soon as user logs in
+ADD config/01-build_hooks/nexus-exam.desktop config/includes.chroot/etc/xdg/autostart/
## Run various X11 settings as soon as user logs in
-ADD config/x11/x11_settings.sh config/includes.chroot/usr/local/bin/
-ADD config/x11/x11_settings.desktop config/includes.chroot/etc/xdg/autostart/
+ADD config/01-build_hooks/x11/x11_settings.sh config/includes.chroot/usr/local/bin/
+ADD config/01-build_hooks/x11/x11_settings.desktop config/includes.chroot/etc/xdg/autostart/
## Systemd service to set various X11 settings (does not work - not sure why)
-# ADD config/systemd/x11_settings.sh config/includes.chroot/usr/local/bin/
+# ADD config/01-build_hooks/systemd/x11_settings.sh config/includes.chroot/usr/local/bin/
# RUN chmod +x config/includes.chroot/usr/local/bin/x11_settings.sh
-# ADD config/systemd/x11_settings.service config/includes.chroot/etc/systemd/system/
+# ADD config/01-build_hooks/systemd/x11_settings.service config/includes.chroot/etc/systemd/system/
+
+# Install nexus server pub cert system wide
+# ADD config/01-build_hooks/${nexus_cert} config/includes.chroot/usr/share/ca-certificates/nexus-server/nexus-server.crt
+## Add environment variables for nexus server and certificate
# RUN mkdir config/includes.chroot/etc/skel/
# RUN echo "export NEXUS_SERVER=${server_ip}\nexport NEXUS_CERT=/etc/ssl/certs/nexus-server.pem\n" >> config/includes.chroot/etc/skel/.xsessionrc
## Customize xfce4 desktop
-ADD config/xubuntu-development.png config/includes.chroot/usr/share/xfce4/backdrops/xubuntu-development.png
-ADD config/xfce/xfce4-desktop.xml config/includes.chroot/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
-ADD config/xfce/xfce4-panel.xml config/includes.chroot/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
-ADD config/xfce/xfce4-settings-manager.xml config/includes.chroot/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
-ADD config/xfce/xfce4-power-manager.xml config/includes.chroot/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
-ADD config/xfce/xfwm4.xml config/includes.chroot/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
+#ADD config/01-build_hooks/xubuntu-development.png config/includes.chroot/usr/share/xfce4/backdrops/xubuntu-development.png
+ADD config/01-build_hooks/xfce/xfce4-desktop.xml config/includes.chroot/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
+ADD config/01-build_hooks/xfce/xfce4-panel.xml config/includes.chroot/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
+ADD config/01-build_hooks/xfce/xfce4-settings-manager.xml config/includes.chroot/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
+ADD config/01-build_hooks/xfce/xfce4-power-manager.xml config/includes.chroot/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
+ADD config/01-build_hooks/xfce/xfwm4.xml config/includes.chroot/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
## Install i3 theme for xfwm4
-ADD config/themes config/includes.chroot/usr/share/themes/
-
-# Install syslinux (bios) cfg
-ADD config/bootloader/isolinux.cfg config/includes.binary/isolinux/isolinux.cfg
-ADD config/bootloader/isolinux_splash.png config/includes.binary/isolinux/splash.png
-# Install grub (uefi) cfg
-ADD config/bootloader/grub_splash.png config/includes.binary/boot/grub/splash.png
-ADD config/bootloader/grub_config.cfg config/includes.binary/boot/grub/config.cfg
-ADD config/bootloader/isolinux_menu.cfg config/includes.binary/isolinux/menu.cfg
-ADD config/bootloader/isolinux_stdmenu.cfg config/includes.binary/isolinux/stdmenu.cfg
-
-# Install nexus server pub cert system wide
-#ADD config/${nexus_cert} config/includes.chroot/usr/share/ca-certificates/nexus-server/nexus-server.crt
+ADD config/01-build_hooks/themes config/includes.chroot/usr/share/themes/
# NTP server configuration
-ADD config/ntp/timesyncd.conf config/includes.chroot/etc/systemd/
+ADD config/01-build_hooks/ntp/timesyncd.conf config/includes.chroot/etc/systemd/
-# Firewall hook ran at boot time
-ADD config/boot_hooks/firewall config/includes.chroot/lib/live/config/9999-firewall
-RUN echo "firewall ${server_ip} ${server_port}\n" >> config/includes.chroot/lib/live/config/9999-firewall
+## Post install hooks
+ADD config/02-post_install_hooks/* config/hooks/live/
-# Install wifi connection
-ADD config/wifi/wifi.nmconnection config/includes.chroot/etc/NetworkManager/system-connections/
-RUN chmod 0600 config/includes.chroot/etc/NetworkManager/system-connections/wifi.nmconnection
-
-# script hook to set password for nexus user (pwd is "pipo")
-# pwd is the crypt's perl function's first argument. Second arg is salt.
-#RUN echo -n "#!/bin/sh\nusermod -p '" >> config/includes.chroot/lib/live/config/0500-user-password.hook.chroot && \
-# perl -e 'print crypt("pipo","\$6\$a9CJ6HTSDXmf\$")' >> config/includes.chroot/lib/live/config/0500-user-password.hook.chroot && \
-# echo "' nexus\n" >> config/includes.chroot/lib/live/config/0500-user-password.hook.chroot && \
-# chmod 0750 config/includes.chroot/lib/live/config/0500-user-password.hook.chroot
+# Boot time hooks
+ADD config/03-boot_hooks/* config/includes.chroot/lib/live/config/
-# Script hook so that user nexus has no password
-RUN echo -n "#!/bin/sh\npasswd -d nexus\n" > config/includes.chroot/lib/live/config/0500-user-password.hook.chroot && \
- chmod 0750 config/includes.chroot/lib/live/config/0500-user-password.hook.chroot
+# Configure firewall hook
+RUN echo "firewall ${server_ip} ${server_port}\n" >> config/includes.chroot/lib/live/config/9999-firewall
-## Add config directory
+## Add config file
ADD config/config auto/
RUN lb config
diff --git a/live_exam_os/config/bootloader/grub_config.cfg b/live_exam_os/config/00-bootloader/grub_config.cfg
similarity index 100%
rename from live_exam_os/config/bootloader/grub_config.cfg
rename to live_exam_os/config/00-bootloader/grub_config.cfg
diff --git a/live_exam_os/config/keyboard/keyboard b/live_exam_os/config/01-build_hooks/keyboard/keyboard
similarity index 100%
rename from live_exam_os/config/keyboard/keyboard
rename to live_exam_os/config/01-build_hooks/keyboard/keyboard
diff --git a/live_exam_os/config/nexus-exam.desktop b/live_exam_os/config/01-build_hooks/nexus-exam.desktop
similarity index 100%
rename from live_exam_os/config/nexus-exam.desktop
rename to live_exam_os/config/01-build_hooks/nexus-exam.desktop
diff --git a/live_exam_os/config/ntp/timesyncd.conf b/live_exam_os/config/01-build_hooks/ntp/timesyncd.conf
similarity index 100%
rename from live_exam_os/config/ntp/timesyncd.conf
rename to live_exam_os/config/01-build_hooks/ntp/timesyncd.conf
diff --git a/live_exam_os/config/packages.list.chroot b/live_exam_os/config/01-build_hooks/packages.list.chroot
similarity index 100%
rename from live_exam_os/config/packages.list.chroot
rename to live_exam_os/config/01-build_hooks/packages.list.chroot
diff --git a/live_exam_os/config/systemd/screen_settings.service b/live_exam_os/config/01-build_hooks/systemd/screen_settings.service
similarity index 100%
rename from live_exam_os/config/systemd/screen_settings.service
rename to live_exam_os/config/01-build_hooks/systemd/screen_settings.service
diff --git a/live_exam_os/config/systemd/screen_settings.sh b/live_exam_os/config/01-build_hooks/systemd/screen_settings.sh
similarity index 100%
rename from live_exam_os/config/systemd/screen_settings.sh
rename to live_exam_os/config/01-build_hooks/systemd/screen_settings.sh
diff --git a/live_exam_os/config/themes/i3/xfwm4/bottom-active.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-active.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/bottom-active.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-active.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/bottom-active.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-active.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/bottom-active.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-active.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/bottom-inactive.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-inactive.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/bottom-inactive.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-inactive.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/bottom-inactive.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-inactive.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/bottom-inactive.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-inactive.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/bottom-left-active.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-left-active.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/bottom-left-active.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-left-active.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/bottom-left-active.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-left-active.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/bottom-left-active.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-left-active.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/bottom-left-inactive.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-left-inactive.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/bottom-left-inactive.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-left-inactive.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/bottom-left-inactive.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-left-inactive.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/bottom-left-inactive.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-left-inactive.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/bottom-right-active.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-right-active.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/bottom-right-active.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-right-active.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/bottom-right-active.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-right-active.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/bottom-right-active.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-right-active.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/bottom-right-inactive.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-right-inactive.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/bottom-right-inactive.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-right-inactive.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/bottom-right-inactive.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-right-inactive.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/bottom-right-inactive.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/bottom-right-inactive.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/left-active.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/left-active.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/left-active.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/left-active.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/left-active.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/left-active.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/left-active.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/left-active.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/left-inactive.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/left-inactive.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/left-inactive.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/left-inactive.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/left-inactive.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/left-inactive.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/left-inactive.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/left-inactive.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/right-active.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/right-active.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/right-active.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/right-active.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/right-active.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/right-active.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/right-active.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/right-active.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/right-inactive.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/right-inactive.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/right-inactive.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/right-inactive.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/right-inactive.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/right-inactive.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/right-inactive.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/right-inactive.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/themerc b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/themerc
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/themerc
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/themerc
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-1-active.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-1-active.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-1-active.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-1-active.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-1-active.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-1-active.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-1-active.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-1-active.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-1-inactive.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-1-inactive.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-1-inactive.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-1-inactive.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-1-inactive.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-1-inactive.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-1-inactive.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-1-inactive.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-2-active.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-2-active.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-2-active.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-2-active.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-2-active.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-2-active.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-2-active.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-2-active.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-2-inactive.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-2-inactive.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-2-inactive.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-2-inactive.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-2-inactive.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-2-inactive.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-2-inactive.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-2-inactive.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-3-active.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-3-active.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-3-active.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-3-active.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-3-active.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-3-active.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-3-active.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-3-active.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-3-inactive.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-3-inactive.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-3-inactive.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-3-inactive.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-3-inactive.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-3-inactive.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-3-inactive.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-3-inactive.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-4-active.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-4-active.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-4-active.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-4-active.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-4-active.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-4-active.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-4-active.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-4-active.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-4-inactive.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-4-inactive.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-4-inactive.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-4-inactive.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-4-inactive.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-4-inactive.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-4-inactive.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-4-inactive.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-5-active.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-5-active.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-5-active.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-5-active.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-5-active.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-5-active.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-5-active.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-5-active.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-5-inactive.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-5-inactive.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-5-inactive.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-5-inactive.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/title-5-inactive.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-5-inactive.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/title-5-inactive.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/title-5-inactive.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/top-left-active.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-left-active.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/top-left-active.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-left-active.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/top-left-active.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-left-active.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/top-left-active.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-left-active.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/top-left-inactive.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-left-inactive.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/top-left-inactive.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-left-inactive.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/top-left-inactive.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-left-inactive.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/top-left-inactive.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-left-inactive.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/top-right-active.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-right-active.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/top-right-active.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-right-active.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/top-right-active.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-right-active.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/top-right-active.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-right-active.xpm
diff --git a/live_exam_os/config/themes/i3/xfwm4/top-right-inactive.png b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-right-inactive.png
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/top-right-inactive.png
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-right-inactive.png
diff --git a/live_exam_os/config/themes/i3/xfwm4/top-right-inactive.xpm b/live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-right-inactive.xpm
similarity index 100%
rename from live_exam_os/config/themes/i3/xfwm4/top-right-inactive.xpm
rename to live_exam_os/config/01-build_hooks/themes/i3/xfwm4/top-right-inactive.xpm
diff --git a/live_exam_os/config/wifi/wifi.nmconnection.example1 b/live_exam_os/config/01-build_hooks/wifi/wifi.nmconnection.example1
similarity index 100%
rename from live_exam_os/config/wifi/wifi.nmconnection.example1
rename to live_exam_os/config/01-build_hooks/wifi/wifi.nmconnection.example1
diff --git a/live_exam_os/config/wifi/wifi.nmconnection.example2 b/live_exam_os/config/01-build_hooks/wifi/wifi.nmconnection.example2
similarity index 100%
rename from live_exam_os/config/wifi/wifi.nmconnection.example2
rename to live_exam_os/config/01-build_hooks/wifi/wifi.nmconnection.example2
diff --git a/live_exam_os/config/x11/x11_settings.desktop b/live_exam_os/config/01-build_hooks/x11/x11_settings.desktop
similarity index 100%
rename from live_exam_os/config/x11/x11_settings.desktop
rename to live_exam_os/config/01-build_hooks/x11/x11_settings.desktop
diff --git a/live_exam_os/config/x11/x11_settings.sh b/live_exam_os/config/01-build_hooks/x11/x11_settings.sh
similarity index 100%
rename from live_exam_os/config/x11/x11_settings.sh
rename to live_exam_os/config/01-build_hooks/x11/x11_settings.sh
diff --git a/live_exam_os/config/xfce/xfce4-desktop.xml b/live_exam_os/config/01-build_hooks/xfce/xfce4-desktop.xml
similarity index 100%
rename from live_exam_os/config/xfce/xfce4-desktop.xml
rename to live_exam_os/config/01-build_hooks/xfce/xfce4-desktop.xml
diff --git a/live_exam_os/config/xfce/xfce4-panel.xml b/live_exam_os/config/01-build_hooks/xfce/xfce4-panel.xml
similarity index 100%
rename from live_exam_os/config/xfce/xfce4-panel.xml
rename to live_exam_os/config/01-build_hooks/xfce/xfce4-panel.xml
diff --git a/live_exam_os/config/xfce/xfce4-power-manager.xml b/live_exam_os/config/01-build_hooks/xfce/xfce4-power-manager.xml
similarity index 100%
rename from live_exam_os/config/xfce/xfce4-power-manager.xml
rename to live_exam_os/config/01-build_hooks/xfce/xfce4-power-manager.xml
diff --git a/live_exam_os/config/xfce/xfce4-settings-manager.xml b/live_exam_os/config/01-build_hooks/xfce/xfce4-settings-manager.xml
similarity index 100%
rename from live_exam_os/config/xfce/xfce4-settings-manager.xml
rename to live_exam_os/config/01-build_hooks/xfce/xfce4-settings-manager.xml
diff --git a/live_exam_os/config/xfce/xfwm4.xml b/live_exam_os/config/01-build_hooks/xfce/xfwm4.xml
similarity index 100%
rename from live_exam_os/config/xfce/xfwm4.xml
rename to live_exam_os/config/01-build_hooks/xfce/xfwm4.xml
diff --git a/live_exam_os/config/9999-removepkg.hook.chroot b/live_exam_os/config/02-post_install_hooks/9999-packages_removal_and_cleanup.hook.chroot
similarity index 100%
rename from live_exam_os/config/9999-removepkg.hook.chroot
rename to live_exam_os/config/02-post_install_hooks/9999-packages_removal_and_cleanup.hook.chroot
diff --git a/live_exam_os/config/03-boot_hooks/1000-remove_user_pwd b/live_exam_os/config/03-boot_hooks/1000-remove_user_pwd
new file mode 100755
index 0000000000000000000000000000000000000000..6ee1bef541f9251d57dbeddbd42cab0c05e331ba
--- /dev/null
+++ b/live_exam_os/config/03-boot_hooks/1000-remove_user_pwd
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. /lib/live/config.sh
+
+passwd -d nexus
diff --git a/live_exam_os/config/03-boot_hooks/1000-set_user_pwd b/live_exam_os/config/03-boot_hooks/1000-set_user_pwd
new file mode 100755
index 0000000000000000000000000000000000000000..018bd639952902d8bce126f95709ef7ebed13b9a
--- /dev/null
+++ b/live_exam_os/config/03-boot_hooks/1000-set_user_pwd
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+. /lib/live/config.sh
+
+# script hook to set password for nexus user (pwd is "pipo")
+# pwd is the crypt's perl function's first argument. Second arg is salt.
+#RUN echo -n "#!/bin/sh\nusermod -p '" >> config/includes.chroot/lib/live/config/0500-user-password.hook.chroot && \
+# perl -e 'print crypt("pipo","\$6\$a9CJ6HTSDXmf\$")' >> config/includes.chroot/lib/live/config/0500-user-password.hook.chroot && \
+# echo "' nexus\n" >> config/includes.chroot/lib/live/config/0500-user-password.hook.chroot && \
+# chmod 0750 config/includes.chroot/lib/live/config/0500-user-password.hook.chroot
diff --git a/live_exam_os/config/boot_hooks/certificates b/live_exam_os/config/03-boot_hooks/3000-certificates
similarity index 100%
rename from live_exam_os/config/boot_hooks/certificates
rename to live_exam_os/config/03-boot_hooks/3000-certificates
diff --git a/live_exam_os/config/boot_hooks/firewall b/live_exam_os/config/03-boot_hooks/9999-firewall
similarity index 100%
rename from live_exam_os/config/boot_hooks/firewall
rename to live_exam_os/config/03-boot_hooks/9999-firewall
diff --git a/live_exam_os/config/bootloader/grub_splash.png b/live_exam_os/config/bootloader/grub_splash.png
deleted file mode 100644
index 30ef47e8a539c9466e0f5394b830dd2338027748..0000000000000000000000000000000000000000
Binary files a/live_exam_os/config/bootloader/grub_splash.png and /dev/null differ
diff --git a/live_exam_os/config/bootloader/isolinux.cfg b/live_exam_os/config/bootloader/isolinux.cfg
deleted file mode 100644
index 13540d82de190f79c068a9f5fbd6a1cd486d1ff2..0000000000000000000000000000000000000000
--- a/live_exam_os/config/bootloader/isolinux.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-include menu.cfg
-default vesamenu.c32
-prompt 0
-timeout 1
-totaltimeout 1
diff --git a/live_exam_os/config/bootloader/isolinux_menu.cfg b/live_exam_os/config/bootloader/isolinux_menu.cfg
deleted file mode 100644
index de3694a2735a63220bda209015b7a73dba4a2201..0000000000000000000000000000000000000000
--- a/live_exam_os/config/bootloader/isolinux_menu.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-menu hshift 0
-menu width 82
-
-menu title Boot menu
-include stdmenu.cfg
-include live.cfg
-menu begin utilities
- menu label ^Utilities
- menu title Utilities
- include stdmenu.cfg
- label mainmenu
- menu label ^Back..
- menu exit
- include utilities.cfg
-menu end
-
-menu clear
diff --git a/live_exam_os/config/bootloader/isolinux_splash.png b/live_exam_os/config/bootloader/isolinux_splash.png
deleted file mode 100644
index dabcae0117c2da588ebfa487d3ed7498c1fc4471..0000000000000000000000000000000000000000
Binary files a/live_exam_os/config/bootloader/isolinux_splash.png and /dev/null differ
diff --git a/live_exam_os/config/bootloader/isolinux_stdmenu.cfg b/live_exam_os/config/bootloader/isolinux_stdmenu.cfg
deleted file mode 100644
index cee75f4892e79ee0dd74bd435f1f7650ed2219e0..0000000000000000000000000000000000000000
--- a/live_exam_os/config/bootloader/isolinux_stdmenu.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-menu background splash.png
-menu color title * #3b658e *
-menu color border * #00000000 #00000000 none
-menu color sel * #ffffffff #76a1d0ff *
-menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
-menu color tabmsg * #ffffffff #00000000 *
-menu color help 37;40 #ffdddd00 #00000000 none
-menu vshift 12
-menu rows 10
-menu helpmsgrow 15
-# The command line must be at least one line from the bottom.
-menu cmdlinerow 16
-menu timeoutrow 16
-menu tabmsgrow 18
-menu tabmsg Press ENTER to boot HEPIA ISC nexus-live-exam
diff --git a/live_exam_os/config/xubuntu-development.png b/live_exam_os/config/xubuntu-development.png
deleted file mode 100644
index 32541088f322c3aace863efd3e9dc58075088036..0000000000000000000000000000000000000000
Binary files a/live_exam_os/config/xubuntu-development.png and /dev/null differ