diff --git a/oem/spitfire-oem-xfce/Packages-Desktop b/oem/spitfire-oem-xfce/Packages-Desktop
new file mode 100644
index 0000000..2914dee
--- /dev/null
+++ b/oem/spitfire-oem-xfce/Packages-Desktop
@@ -0,0 +1,297 @@
+## Network
+avahi
+networkmanager
+networkmanager-openconnect
+networkmanager-openvpn
+networkmanager-pptp
+networkmanager-vpnc
+nss-mdns # NSS support for mDNS (optdepend for avahi)
+ntp
+mobile-broadband-provider-info
+modemmanager
+openresolv
+openssh
+samba
+usb_modeswitch
+
+## Libraries for Sound/Audio/Video
+alsa-firmware
+alsa-utils
+ffmpeg
+gst-libav
+gst-plugins-bad
+gst-plugins-base
+gst-plugins-good
+gst-plugins-ugly
+libdvdcss
+>multilib manjaro-alsa
+manjaro-pulse
+pulseaudio-bluetooth
+pulseaudio-ctl
+pulseaudio-equalizer-ladspa
+pulseaudio-zeroconf
+
+## Connect Packages
+android-tools
+android-udev
+gvfs
+gvfs-afc
+gvfs-gphoto2
+gvfs-mtp
+gvfs-nfs
+gvfs-smb
+mtpfs
+udiskie
+udisks2
+
+## AUR Support/Development
+# Missing base-devel packages
+autoconf
+automake
+binutils
+bison
+fakeroot
+flex
+gcc
+>multilib gcc-libs-multilib
+>multilib gcc-multilib
+libtool
+m4
+make
+patch
+pkg-config
+>multilib lib32-flex
+# Extra packages for AUR support
+>extra git
+>extra patchutils
+>extra subversion
+>extra yay
+>extra manjaro-aur-support
+
+## Fonts
+cantarell-fonts
+noto-fonts             # default font
+# noto-fonts-cjk         # big package, ~76 mb compressed
+# >extra noto-fonts-emoji
+terminus-font
+ttf-bitstream-vera       # xfce4-terminal default Monospace
+# ttf-dejavu             # Installed as gnome-themes-standard dependency
+>extra ttf-inconsolata
+>extra ttf-indic-otf
+>extra ttf-liberation
+>extra ttf-droid
+
+## Games
+>extra steam-manjaro
+
+## Package management
+pamac
+#flatpak
+
+## Java
+>extra jdk8-openjdk
+>extra jre8-openjdk-headless
+>extra jre8-openjdk
+
+## Printing
+>extra cups
+>extra cups-pdf
+>extra cups-pk-helper
+>extra ghostscript
+>extra gsfonts
+#>extra gtk3-print-backends
+>extra hplip
+>extra splix
+>extra system-config-printer
+
+## Optional dependencies for hplip
+>extra pyqt5-common # For hplip
+>extra python-pillow # For hplip
+>extra python-pip # For hplip
+>extra python-pyqt5  # For hplip gui
+>extra python-reportlab # For hplip
+
+## Display manager
+lightdm
+lightdm-slick-greeter
+lightdm-settings
+accountsservice  # Enhanced user accounts handling
+
+## GTK3
+gtk3-classic
+>multilib lib32-gtk3-classic
+
+## XFCE Group
+exo-gtk3
+garcon-gtk3
+thunar-gtk3
+thunar-volman
+tumbler
+xfce4-appfinder-gtk3
+xfce4-panel-gtk3
+xfce4-power-manager-gtk3
+xfce4-session-gtk3
+xfce4-settings-gtk3
+xfce4-terminal
+xfconf-gtk3
+xfdesktop-gtk3
+xfwm4-gtk3
+
+## XFCE Extras
+blueman
+bluez-utils
+ffmpegthumbnailer  # tumbler - for video thumbnails
+freetype2          # tumbler - for font thumbnails
+gksu-polkit
+gnome-keyring      # fix wlan segfault
+libgsf             # tumbler - for ODF thumbnails
+libopenraw         # tumbler - for RAW thumbnails
+light-locker
+network-manager-applet
+menulibre
+orage
+poppler-glib       # tumbler - for PDF thumbnails
+thunar-archive-plugin
+file-roller
+thunar-media-tags-plugin
+# >extra xfce4-artwork
+xfce4-battery-plugin
+xfce4-clipman-plugin
+>extra xfce4-cpufreq-plugin
+>extra xfce4-cpugraph-plugin
+# xfce4-datetime-plugin
+>extra xfce4-dict
+>extra xfce4-diskperf-plugin
+>extra xfce4-fsguard-plugin
+>extra xfce4-genmon-plugin
+>extra xfce4-mailwatch-plugin
+>extra xfce4-mount-plugin
+>extra xfce4-mpc-plugin
+>extra xfce4-netload-plugin
+>extra xfce4-notes-plugin
+xfce4-notifyd-gtk3
+xfce4-screenshooter
+>extra xfce4-sensors-plugin
+>extra xfce4-smartbookmark-plugin
+>extra xfce4-systemload-plugin
+xfce4-taskmanager
+>extra xfce4-time-out-plugin
+>extra xfce4-timer-plugin
+>extra xfce4-verve-plugin
+>extra xfce4-wavelan-plugin
+>extra xfce4-weather-plugin
+xfce4-whiskermenu-plugin-gtk3
+xfce4-xkb-plugin
+xfce4-pulseaudio-plugin
+pavucontrol
+
+## Themes
+>extra manjaro-wallpapers-18.0
+>extra wallpapers-2018
+gnome-icon-theme
+gnome-themes-standard
+kvantum-manjaro
+grub-theme-manjaro
+matcha-gtk-theme
+xcursor-simpleandsoft
+xcursor-vanilla-dmz-aa
+>extra vibrancy-icons-teal
+>extra xfce-theme-greybird
+
+## Applications
+>extra catfish
+dmidecode # optional dependency inxi
+engrampa
+>extra firefox
+# >extra flashplugin
+>extra galculator
+gcolor2
+>extra gimp
+gparted
+gufw
+>extra audacious
+>extra hexchat
+htop
+qpdfview
+inxi
+>extra libreoffice-still
+ms-office-online
+manjaro-hello
+manjaro-application-utility
+manjaro-settings-manager
+manjaro-settings-manager-notifier
+>basic midori
+>extra mlocate
+mousepad
+mugshot
+>basic parole # media player
+>extra pidgin
+powertop
+screenfetch
+>extra poppler-data  # CKJ support for pdf
+>basic sylpheed # mail client
+>extra thunderbird
+>extra vlc
+>extra viewnior
+>extra xfburn
+xreader
+>extra yelp
+
+# Optional dependencies engrampa
+p7zip  # 7Z and ARJ archive support
+unace  # ACE archive support
+unrar  # RAR archive support
+
+## Documentation
+manjaro-documentation-en
+
+## Settings packages
+xfce-sx-settings
+manjaro-browser-settings
+
+## Xorg Input Drivers
+xf86-input-elographics
+xf86-input-evdev
+xf86-input-keyboard
+xf86-input-libinput
+xf86-input-mouse
+xf86-input-void
+
+## Xorg Server and Graphics
+>multilib lib32-libva-intel-driver
+>multilib lib32-libva-mesa-driver
+>multilib lib32-libva-vdpau-driver
+libva-intel-driver
+libva-mesa-driver
+libva-vdpau-driver
+mesa-demos
+>multilib lib32-mesa-demos
+numlockx
+xdg-user-dirs
+xorg-server
+xorg-twm
+xorg-xinit
+xorg-xkill
+
+## Desktop Utils
+perl-file-mimeinfo
+xdg-utils
+xdg-su
+
+## Misc
+manjaro-hotfixes
+lm_sensors
+#thermald
+powertop
+tlpui
+#x86_energy_perf_policy
+ethtool
+smartmontools
+stationx-driver
+indicator-sensors
+hdparm
+sx-sf-hdparm-sdb-idle
+
+## OEM
+calamares-oem-modules
+calamares-oem-sx-settings
diff --git a/oem/spitfire-oem-xfce/Packages-Live b/oem/spitfire-oem-xfce/Packages-Live
new file mode 100644
index 0000000..0abf130
--- /dev/null
+++ b/oem/spitfire-oem-xfce/Packages-Live
@@ -0,0 +1,6 @@
+grub-theme-live-manjaro
+manjaro-live-skel
+manjaro-live-systemd
+mkinitcpio-nfs-utils
+nbd
+squashfs-tools
\ No newline at end of file
diff --git a/oem/spitfire-oem-xfce/Packages-Root b/oem/spitfire-oem-xfce/Packages-Root
new file mode 120000
index 0000000..60cc7bd
--- /dev/null
+++ b/oem/spitfire-oem-xfce/Packages-Root
@@ -0,0 +1 @@
+../../shared/Packages-Root
\ No newline at end of file
diff --git a/oem/spitfire-oem-xfce/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf b/oem/spitfire-oem-xfce/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf
new file mode 100644
index 0000000..90d5497
--- /dev/null
+++ b/oem/spitfire-oem-xfce/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+       Identifier "tap-by-default"
+       MatchIsTouchpad "on"
+       MatchDriver "libinput"
+       Option "Tapping" "on"
+EndSection
diff --git a/oem/spitfire-oem-xfce/desktop-overlay/etc/conf.d/lm_sensors b/oem/spitfire-oem-xfce/desktop-overlay/etc/conf.d/lm_sensors
new file mode 100644
index 0000000..020b08e
--- /dev/null
+++ b/oem/spitfire-oem-xfce/desktop-overlay/etc/conf.d/lm_sensors
@@ -0,0 +1,9 @@
+# Generated by sensors-detect on Thu Jul 20 02:36:43 2017
+# This file is sourced by /etc/init.d/lm_sensors and defines the modules to
+# be loaded/unloaded.
+#
+# The format of this file is a shell script that simply defines variables:
+# HWMON_MODULES for hardware monitoring driver modules, and optionally
+# BUS_MODULES for any required bus driver module (for example for I2C or SPI).
+
+HWMON_MODULES="coretemp"
diff --git a/oem/spitfire-oem-xfce/desktop-overlay/etc/default/tlp b/oem/spitfire-oem-xfce/desktop-overlay/etc/default/tlp
new file mode 100644
index 0000000..0fb9280
--- /dev/null
+++ b/oem/spitfire-oem-xfce/desktop-overlay/etc/default/tlp
@@ -0,0 +1,307 @@
+# ------------------------------------------------------------------------------
+# tlp - Parameters for power saving
+# See full explanation: http://linrunner.de/en/tlp/docs/tlp-configuration.html
+
+# Hint: some features are disabled by default, remove the leading # to enable
+# them.
+
+# Set to 0 to disable, 1 to enable TLP.
+TLP_ENABLE=1
+
+# Operation mode when no power supply can be detected: AC, BAT
+# Concerns some desktop and embedded hardware only.
+TLP_DEFAULT_MODE=AC
+
+# Operation mode select: 0=depend on power source, 1=always use TLP_DEFAULT_MODE
+# Hint: use in conjunction with TLP_DEFAULT_MODE=BAT for BAT settings on AC
+TLP_PERSISTENT_DEFAULT=0
+
+# Seconds laptop mode has to wait after the disk goes idle before doing a sync.
+# Non-zero value enables, zero disables laptop mode.
+DISK_IDLE_SECS_ON_AC=0
+DISK_IDLE_SECS_ON_BAT=2
+
+# Dirty page values (timeouts in secs).
+MAX_LOST_WORK_SECS_ON_AC=15
+MAX_LOST_WORK_SECS_ON_BAT=60
+
+# Hint: CPU parameters below are disabled by default, remove the leading #
+# to enable them, otherwise kernel default values are used.
+
+# Select a CPU frequency scaling governor.
+# Intel Core i processor with intel_pstate driver:
+#   powersave(*), performance
+# Older hardware with acpi-cpufreq driver:
+#   ondemand(*), powersave, performance, conservative, schedutil
+# (*) is recommended.
+# Hint: use tlp-stat -p to show the active driver and available governors.
+# Important:
+#   powersave for intel_pstate and ondemand for acpi-cpufreq are power
+#   efficient for *almost all* workloads and therefore kernel and most
+#   distributions have chosen them as defaults. If you still want to change,
+#   you should know what you're doing! You *must* disable your distribution's
+#   governor settings or conflicts will occur.
+#CPU_SCALING_GOVERNOR_ON_AC=powersave
+#CPU_SCALING_GOVERNOR_ON_BAT=powersave
+
+# Set the min/max frequency available for the scaling governor.
+# Possible values strongly depend on your CPU. For available frequencies see
+# the output of tlp-stat -p.
+#CPU_SCALING_MIN_FREQ_ON_AC=0
+#CPU_SCALING_MAX_FREQ_ON_AC=0
+#CPU_SCALING_MIN_FREQ_ON_BAT=0
+#CPU_SCALING_MAX_FREQ_ON_BAT=0
+
+# Set energy performance hints (HWP) for Intel P-state governor:
+#   performance, balance_performance, default, balance_power, power
+# Values are given in order of increasing power saving.
+# Note: Intel Skylake or newer CPU and Kernel >= 4.10 required.
+CPU_HWP_ON_AC=balance_performance
+CPU_HWP_ON_BAT=balance_power
+
+# Set Intel P-state performance: 0..100 (%)
+# Limit the max/min P-state to control the power dissipation of the CPU.
+# Values are stated as a percentage of the available performance.
+# Requires an Intel Core i processor with intel_pstate driver.
+CPU_MIN_PERF_ON_AC=0
+CPU_MAX_PERF_ON_AC=100
+CPU_MIN_PERF_ON_BAT=0
+CPU_MAX_PERF_ON_BAT=50
+
+# Set the CPU "turbo boost" feature: 0=disable, 1=allow
+# Requires an Intel Core i processor.
+# Important:
+# - This may conflict with your distribution's governor settings
+# - A value of 1 does *not* activate boosting, it just allows it
+CPU_BOOST_ON_AC=1
+CPU_BOOST_ON_BAT=0
+
+# Minimize number of used CPU cores/hyper-threads under light load conditions:
+#   0=disable, 1=enable.
+SCHED_POWERSAVE_ON_AC=0
+SCHED_POWERSAVE_ON_BAT=1
+
+# Kernel NMI Watchdog:
+#   0=disable (default, saves power), 1=enable (for kernel debugging only)
+NMI_WATCHDOG=0
+
+# Change CPU voltages aka "undervolting" - Kernel with PHC patch required
+# Frequency voltage pairs are written to:
+#   /sys/devices/system/cpu/cpu0/cpufreq/phc_controls
+# CAUTION: only use this, if you thoroughly understand what you are doing!
+#PHC_CONTROLS="F:V F:V F:V F:V"
+
+# Set CPU performance versus energy savings policy:
+#   performance, normal, powersave
+# Requires kernel module msr and x86_energy_perf_policy from linux-tools
+#   performance, balance-performance, default, balance-power, power.
+# Values are given in order of increasing power saving.
+# Requires kernel module msr and x86_energy_perf_policy from linux-tools.
+ENERGY_PERF_POLICY_ON_AC=performance
+ENERGY_PERF_POLICY_ON_BAT=power
+
+# Disk devices; separate multiple devices with spaces (default: sda).
+DISK_DEVICES="sda sdb"
+
+# Disk advanced power management level: 1..254, 255 (max saving, min, off).
+# Levels 1..127 may spin down the disk; 255 allowable on most drives.
+# Separate values for multiple disks with spaces. Use the special value 'keep'
+# to keep the hardware default for the particular disk.
+DISK_APM_LEVEL_ON_AC="254 254"
+DISK_APM_LEVEL_ON_BAT="128 128"
+
+# Hard disk spin down timeout:
+#   0:        spin down disabled
+#   1..240:   timeouts from 5s to 20min (in units of 5s)
+#   241..251: timeouts from 30min to 5.5 hours (in units of 30min)
+# See 'man hdparm' for details.
+# Separate values for multiple disks with spaces. Use the special value 'keep'
+# to keep the hardware default for the particular disk.
+#DISK_SPINDOWN_TIMEOUT_ON_AC="0 0"
+#DISK_SPINDOWN_TIMEOUT_ON_BAT="0 0"
+
+# Select IO scheduler for the disk devices: cfq, deadline, noop (Default: cfq);
+# Separate values for multiple disks with spaces. Use the special value 'keep'
+# to keep the kernel default scheduler for the particular disk.
+#DISK_IOSCHED="cfq cfq"
+
+# AHCI link power management (ALPM) for disk devices:
+#   min_power, med_power_with_dipm(*), medium_power, max_performance.
+# (*) Kernel >= 4.15 required, then recommended.
+# Multiple values separated with spaces are tried sequentially until success.
+SATA_LINKPWR_ON_AC=max_performance
+SATA_LINKPWR_ON_BAT=min_power
+
+# Exclude host devices from AHCI link power management.
+# Separate multiple hosts with spaces.
+#SATA_LINKPWR_BLACKLIST="host1"
+
+# Runtime Power Management for AHCI host and disks devices:
+#   on=disable, auto=enable.
+# EXPERIMENTAL ** WARNING: auto will most likely cause system lockups/data loss.
+#AHCI_RUNTIME_PM_ON_AC=on
+#AHCI_RUNTIME_PM_ON_BAT=on
+
+# Seconds of inactivity before disk is suspended
+AHCI_RUNTIME_PM_TIMEOUT=15
+
+# PCI Express Active State Power Management (PCIe ASPM):
+#   default, performance, powersave
+PCIE_ASPM_ON_AC=performance
+PCIE_ASPM_ON_BAT=powersave
+
+# Radeon graphics clock speed (profile method): low, mid, high, auto, default;
+# auto = mid on BAT, high on AC; default = use hardware defaults.
+#RADEON_POWER_PROFILE_ON_AC=default
+#RADEON_POWER_PROFILE_ON_BAT=low
+
+# Radeon dynamic power management method (DPM): battery, performance.
+#RADEON_DPM_STATE_ON_AC=performance
+#RADEON_DPM_STATE_ON_BAT=battery
+
+# Radeon DPM performance level: auto, low, high; auto is recommended.
+#RADEON_DPM_PERF_LEVEL_ON_AC=auto
+#RADEON_DPM_PERF_LEVEL_ON_BAT=auto
+
+# WiFi power saving mode: on=enable, off=disable; not supported by all adapters.
+WIFI_PWR_ON_AC=off
+WIFI_PWR_ON_BAT=on
+
+# Disable wake on LAN: Y/N
+WOL_DISABLE=Y
+
+# Enable audio power saving for Intel HDA, AC97 devices (timeout in secs).
+# A value of 0 disables, >=1 enables power saving (recommended: 1).
+SOUND_POWER_SAVE_ON_AC=0
+SOUND_POWER_SAVE_ON_BAT=1
+
+# Disable controller too (HDA only): Y/N
+SOUND_POWER_SAVE_CONTROLLER=Y
+
+# Power off optical drive in UltraBay/MediaBay: 0=disable, 1=enable.
+# Drive can be powered on again by releasing (and reinserting) the eject lever
+# or by pressing the disc eject button on newer models.
+# Note: an UltraBay/MediaBay hard disk is never powered off.
+BAY_POWEROFF_ON_AC=0
+BAY_POWEROFF_ON_BAT=0
+# Optical drive device to power off (default sr0).
+BAY_DEVICE="sr0"
+
+# Runtime Power Management for PCI(e) bus devices: on=disable, auto=enable
+RUNTIME_PM_ON_AC=on
+RUNTIME_PM_ON_BAT=auto
+
+# Exclude PCI(e) device adresses the following list from Runtime PM
+# (separate with spaces). Use lspci to get the adresses (1st column).
+#RUNTIME_PM_BLACKLIST="bb:dd.f 11:22.3 44:55.6"
+
+# Exclude PCI(e) devices assigned to the listed drivers from Runtime PM.
+# Default when unconfigured is "amdgpu nouveau nvidia radeon" which
+# prevents accidential power-on of dGPU in hybrid graphics setups.
+# Use "" to disable the feature completely.
+# Separate multiple drivers with spaces.
+#RUNTIME_PM_DRIVER_BLACKLIST="amdgpu nouveau nvidia radeon pcieport"
+
+# Set to 0 to disable, 1 to enable aggressive USB autosuspend feature.
+USB_AUTOSUSPEND=1
+
+# Exclude listed devices from USB autosuspend (separate with spaces).
+# Use lsusb to get the ids.
+# Note: input devices (usbhid) are excluded automatically
+#USB_BLACKLIST="1111:2222 3333:4444"
+
+# Bluetooth devices are excluded from USB autosuspend:
+#   0=do not exclude, 1=exclude
+USB_BLACKLIST_BTUSB=0
+
+# Phone devices are excluded from USB autosuspend:
+#   0=do not exclude, 1=exclude (enable charging)
+USB_BLACKLIST_PHONE=0
+
+# Printers are excluded from USB autosuspend:
+#   0=do not exclude, 1=exclude.
+USB_BLACKLIST_PRINTER=1
+
+# WWAN devices are excluded from USB autosuspend:
+#   0=do not exclude, 1=exclude
+USB_BLACKLIST_WWAN=1
+
+# Include listed devices into USB autosuspend even if already excluded
+# by the blacklists above (separate with spaces).
+# Use lsusb to get the ids.
+#USB_WHITELIST="1111:2222 3333:4444"
+
+# Set to 1 to disable autosuspend before shutdown, 0 to do nothing
+# (workaround for USB devices that cause shutdown problems).
+#USB_AUTOSUSPEND_DISABLE_ON_SHUTDOWN=1
+
+# Restore radio device state (Bluetooth, WiFi, WWAN) from previous shutdown
+# on system startup: 0=disable, 1=enable.
+# Hint: the parameters DEVICES_TO_DISABLE/ENABLE_ON_STARTUP/SHUTDOWN below
+#   are ignored when this is enabled!
+RESTORE_DEVICE_STATE_ON_STARTUP=0
+
+# Radio devices to disable on startup: bluetooth, wifi, wwan.
+# Separate multiple devices with spaces.
+#DEVICES_TO_DISABLE_ON_STARTUP="bluetooth wifi wwan"
+
+# Radio devices to enable on startup: bluetooth, wifi, wwan.
+# Separate multiple devices with spaces.
+#DEVICES_TO_ENABLE_ON_STARTUP="wifi"
+
+# Radio devices to disable on shutdown: bluetooth, wifi, wwan
+# (workaround for devices that are blocking shutdown).
+#DEVICES_TO_DISABLE_ON_SHUTDOWN="bluetooth wifi wwan"
+
+# Radio devices to enable on shutdown: bluetooth, wifi, wwan
+# (to prevent other operating systems from missing radios).
+#DEVICES_TO_ENABLE_ON_SHUTDOWN="wwan"
+
+# Radio devices to enable on AC: bluetooth, wifi, wwan
+#DEVICES_TO_ENABLE_ON_AC="bluetooth wifi wwan"
+
+# Radio devices to disable on battery: bluetooth, wifi, wwan
+#DEVICES_TO_DISABLE_ON_BAT="bluetooth wifi wwan"
+
+# Radio devices to disable on battery when not in use (not connected):
+# bluetooth, wifi, wwan
+#DEVICES_TO_DISABLE_ON_BAT_NOT_IN_USE="bluetooth wifi wwan"
+
+# Battery charge thresholds (ThinkPad only, tp-smapi or acpi-call kernel module
+# required). Charging starts when the remaining capacity falls below the
+# START_CHARGE_THRESH value and stops when exceeding the STOP_CHARGE_THRESH value.
+# Main / Internal battery (values in %)
+#START_CHARGE_THRESH_BAT0=75
+#STOP_CHARGE_THRESH_BAT0=80
+# Ultrabay / Slice / Replaceable battery (values in %)
+#START_CHARGE_THRESH_BAT1=75
+#STOP_CHARGE_THRESH_BAT1=80
+
+# Restore charge thresholds when AC is unplugged: 0=disable, 1=enable
+#RESTORE_THRESHOLDS_ON_BAT=1
+
+# ------------------------------------------------------------------------------
+# tlp-rdw - Parameters for the radio device wizard
+# Possible devices: bluetooth, wifi, wwan
+
+# Hints:
+# - Parameters are disabled by default, remove the leading # to enable them.
+# - Separate multiple radio devices with spaces.
+
+# Radio devices to disable on connect.
+#DEVICES_TO_DISABLE_ON_LAN_CONNECT="wifi wwan"
+#DEVICES_TO_DISABLE_ON_WIFI_CONNECT="wwan"
+#DEVICES_TO_DISABLE_ON_WWAN_CONNECT="wifi"
+
+# Radio devices to enable on disconnect.
+#DEVICES_TO_ENABLE_ON_LAN_DISCONNECT="wifi wwan"
+#DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT=""
+#DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT=""
+
+# Radio devices to enable/disable when docked.
+#DEVICES_TO_ENABLE_ON_DOCK=""
+#DEVICES_TO_DISABLE_ON_DOCK=""
+
+# Radio devices to enable/disable when undocked.
+#DEVICES_TO_ENABLE_ON_UNDOCK="wifi"
+#DEVICES_TO_DISABLE_ON_UNDOCK=""
diff --git a/oem/spitfire-oem-xfce/desktop-overlay/etc/fonts/conf.d/70-no-bitmaps.conf b/oem/spitfire-oem-xfce/desktop-overlay/etc/fonts/conf.d/70-no-bitmaps.conf
new file mode 120000
index 0000000..d6c7fc1
--- /dev/null
+++ b/oem/spitfire-oem-xfce/desktop-overlay/etc/fonts/conf.d/70-no-bitmaps.conf
@@ -0,0 +1 @@
+/etc/fonts/conf.avail/70-no-bitmaps.conf
\ No newline at end of file
diff --git a/oem/spitfire-oem-xfce/desktop-overlay/etc/issue b/oem/spitfire-oem-xfce/desktop-overlay/etc/issue
new file mode 100644
index 0000000..bc80fb4
--- /dev/null
+++ b/oem/spitfire-oem-xfce/desktop-overlay/etc/issue
@@ -0,0 +1,3 @@
+Manjaro Linux \r  (\n) (\l)
+
+setterm -cursor on
diff --git a/oem/spitfire-oem-xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf b/oem/spitfire-oem-xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf
new file mode 100644
index 0000000..6863584
--- /dev/null
+++ b/oem/spitfire-oem-xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf
@@ -0,0 +1,15 @@
+[greeter]
+background = /usr/share/backgrounds/greeter.jpg
+font-name = Cantarell 10
+xft-antialias = true
+icon-theme-name = Vibrancy-Full-Dark-Teal
+screensaver-timeout = 60
+theme-name = Vertex-Maia-Dark
+cursor-theme-name = xcursor-breeze
+show-clock = false
+default-user-image = /usr/share/icons/manjaro/maia/48x48.png
+xft-hintstyle = hintfull
+position = 54%,center 27%,start
+clock-format = 
+panel-position = bottom
+indicators = ~host;~spacer;~clock;~spacer;~language;~session;~a11y;~power
diff --git a/oem/spitfire-oem-xfce/desktop-overlay/etc/lightdm/slick-greeter.conf b/oem/spitfire-oem-xfce/desktop-overlay/etc/lightdm/slick-greeter.conf
new file mode 100644
index 0000000..162adc3
--- /dev/null
+++ b/oem/spitfire-oem-xfce/desktop-overlay/etc/lightdm/slick-greeter.conf
@@ -0,0 +1,13 @@
+[Greeter]
+background=/usr/share/backgrounds/msx_dark02.jpg
+background-color=#2e3d44
+draw-grid=false
+theme-name=Adapta-Nokto-Eta-Maia
+icon-theme-name=Papirus-Adapta-Nokto-Maia
+font-name='Noto Sans 11'
+xft-antialias=true
+xft-hintstyle=hintfull
+enable-hidpi=auto
+show-hostname=false
+show-a11y=false
+show-keyboard=false
diff --git a/oem/spitfire-oem-xfce/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf b/oem/spitfire-oem-xfce/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf
new file mode 100644
index 0000000..47146d2
--- /dev/null
+++ b/oem/spitfire-oem-xfce/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf
@@ -0,0 +1 @@
+kernel.printk = 3 3 3 3
diff --git a/oem/spitfire-oem-xfce/desktop-overlay/etc/sysctl.d/99-swappiness.conf b/oem/spitfire-oem-xfce/desktop-overlay/etc/sysctl.d/99-swappiness.conf
new file mode 100644
index 0000000..b700b4d
--- /dev/null
+++ b/oem/spitfire-oem-xfce/desktop-overlay/etc/sysctl.d/99-swappiness.conf
@@ -0,0 +1 @@
+vm.swappiness=10
\ No newline at end of file
diff --git a/oem/spitfire-oem-xfce/desktop-overlay/usr/share/icons/default/index.theme b/oem/spitfire-oem-xfce/desktop-overlay/usr/share/icons/default/index.theme
new file mode 100644
index 0000000..05623f3
--- /dev/null
+++ b/oem/spitfire-oem-xfce/desktop-overlay/usr/share/icons/default/index.theme
@@ -0,0 +1,2 @@
+[icon theme]
+Inherits=xcursor-breeze
diff --git a/oem/spitfire-oem-xfce/live-overlay/etc b/oem/spitfire-oem-xfce/live-overlay/etc
new file mode 120000
index 0000000..caab87d
--- /dev/null
+++ b/oem/spitfire-oem-xfce/live-overlay/etc
@@ -0,0 +1 @@
+../../../shared/manjaro/live-overlay/etc
\ No newline at end of file
diff --git a/oem/spitfire-oem-xfce/live-overlay/root/.config/Kvantum/kvantum.kvconfig b/oem/spitfire-oem-xfce/live-overlay/root/.config/Kvantum/kvantum.kvconfig
new file mode 100644
index 0000000..01ee4a1
--- /dev/null
+++ b/oem/spitfire-oem-xfce/live-overlay/root/.config/Kvantum/kvantum.kvconfig
@@ -0,0 +1,2 @@
+[General]
+theme=KvAdaptaMaia
diff --git a/oem/spitfire-oem-xfce/live-overlay/root/.config/qt5ct/qt5ct.conf b/oem/spitfire-oem-xfce/live-overlay/root/.config/qt5ct/qt5ct.conf
new file mode 100644
index 0000000..372a44a
--- /dev/null
+++ b/oem/spitfire-oem-xfce/live-overlay/root/.config/qt5ct/qt5ct.conf
@@ -0,0 +1,24 @@
+[Appearance]
+color_scheme_path=
+custom_palette=false
+icon_theme=Papirus-Adapta-Maia
+style=kvantum
+
+[Fonts]
+fixed=@Variant(\0\0\0@\0\0\0\x12\0\x43\0\x61\0n\0t\0\x61\0r\0\x65\0l\0l@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+general=@Variant(\0\0\0@\0\0\0\x12\0\x43\0\x61\0n\0t\0\x61\0r\0\x65\0l\0l@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+
+[Interface]
+activate_item_on_single_click=1
+buttonbox_layout=0
+cursor_flash_time=1000
+dialog_buttons_have_icons=1
+double_click_interval=400
+gui_effects=@Invalid()
+menus_have_icons=true
+stylesheets=@Invalid()
+toolbutton_style=4
+wheel_scroll_lines=3
+
+[SettingsWindow]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\x1\x9a\0\0\0\x80\0\0\x3\xd6\0\0\x2\xff\0\0\x1\x9a\0\0\0\xa2\0\0\x3\xd6\0\0\x2\xff\0\0\0\0\0\0\0\0\x5V)
diff --git a/oem/spitfire-oem-xfce/live-overlay/usr b/oem/spitfire-oem-xfce/live-overlay/usr
new file mode 120000
index 0000000..8aca2d5
--- /dev/null
+++ b/oem/spitfire-oem-xfce/live-overlay/usr
@@ -0,0 +1 @@
+../../../shared/oem/live-overlay/usr
\ No newline at end of file
diff --git a/oem/spitfire-oem-xfce/profile.conf b/oem/spitfire-oem-xfce/profile.conf
new file mode 100644
index 0000000..76a59e2
--- /dev/null
+++ b/oem/spitfire-oem-xfce/profile.conf
@@ -0,0 +1,68 @@
+##########################################
+###### use this file in the profile ######
+##########################################
+
+# use multilib packages; x86_64 only
+multilib="false"
+
+displaymanager="lightdm"
+
+# Set to false to disable autologin in the livecd
+# autologin="true"
+
+# nonfree mhwd drivers
+nonfree_mhwd="false"
+
+# use extra packages as defined in pkglist to activate a full profile
+extra="true"
+
+################ install ################
+
+# unset defaults to given value
+# efi_boot_loader="grub"
+
+# configure calamares for mhwd
+mhwd_used="false"
+
+# configure calamares for oem
+oem_used="true"
+
+# configure calamares for netinstall
+# netinstall="false"
+
+# configure calamares to use chrootcfg instead of unpackfs
+# chrootcfg="false"
+
+# use geoip for localization
+# geoip='true'
+
+# unset defaults to given values
+# names must match systemd service names
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'fstrim.timer' 'ModemManager' 'NetworkManager' 'org.cups.cupsd'  'stationx-daemon'  'systemd-timesyncd' 'tlp' 'tlp-sleep' 'ufw')
+disable_systemd=('pacman-init')
+
+# the same workgroup name if samba is used
+# smb_workgroup=""
+
+################# livecd #################
+
+# unset defaults to given value
+hostname="manjaro-sx"
+
+# unset defaults to given value
+# username="manjaro"
+
+# unset defaults to given value
+# password="manjaro"
+
+# the login shell
+# defaults to bash
+# login_shell=/bin/bash
+
+# unset defaults to given values
+# addgroups="lp,network,power,wheel"
+
+# unset defaults to given values
+# names must match systemd service names
+# services in enable_systemd array don't need to be listed here
+# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')