diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 581ed99f..d00012e9 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -52,6 +52,8 @@ jobs:
         variant:
           - base/base-docker-x86_64
           - base/base-docker-aarch64
+          - base/devtools-docker-aarch64
+          - base/devtools-docker-x86_64
 
     outputs:
       artifact: ${{ matrix.variant }}
diff --git a/.github/workflows/build-katsu.yml b/.github/workflows/build-katsu.yml
index 6d5ec2eb..d22cd3a2 100644
--- a/.github/workflows/build-katsu.yml
+++ b/.github/workflows/build-katsu.yml
@@ -54,7 +54,16 @@ jobs:
           - aarch64
         variant:
           - base/base-disk
-          #- flagship/flagship-chromebook
+          - flagship/base-disk
+          - gnome/base-disk
+          - kde/base-disk
+          - xfce/base-disk
+          #- pantheon/base-disk
+          - flagship/flagship-chromebook
+          - gnome/gnome-chromebook
+          - kde/kde-chromebook
+          - xfce/xfce-chromebook
+          #- pantheon/pantheon-chromebook
           # TODO: figure out how to get loop devices to work on our ARM runners
     runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }}
     container:
@@ -86,15 +95,14 @@ jobs:
       - name: ${{ env.KATSU_BUILD_TASK_NAME }}
         run: |
           pushd katsu
-          KATSU_LOG=trace KATSU_DRACUT_EXTRA_ARGS="--debug" katsu -v --output=disk-image modules/${{ matrix.variant }}-${{ matrix.arch }}.yaml
-          xz -z9 katsu-work/image/katsu.img -c > katsu-work/image/ultramarine-40-${{ matrix.arch }}.img.xz
+          KATSU_LOG=trace katsu -v --output=disk-image "modules/${{ matrix.variant }}-${{ matrix.arch }}.yaml"
           popd
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact }}-image
-          path: katsu/katsu-work/image/*.img.xz
+          path: katsu/katsu-work/image/*.img
 
   live-iso:
     strategy:
@@ -107,7 +115,8 @@ jobs:
           - flagship/flagship-live
           - gnome/gnome-live
           - kde/kde-live
-          - pantheon/pantheon-live
+          #- pantheon/pantheon-live
+          - xfce/xfce-live
     runs-on: ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'arm64' }}
     container:
       image: ghcr.io/terrapkg/builder:f40
@@ -136,7 +145,7 @@ jobs:
       - name: ${{ env.KATSU_BUILD_TASK_NAME }}
         run: |
           pushd katsu
-          KATSU_LOG=trace KATSU_DRACUT_EXTRA_ARGS="--debug" katsu -v --output=iso modules/${{ matrix.variant }}.yaml
+          KATSU_LOG=trace katsu -v --output=iso "modules/${{ matrix.variant }}.yaml"
           # get the ISO name, and then append the arch
           # e.g. flagship-live.iso -> flagship-live-x86_64.iso
 
diff --git a/.gitignore b/.gitignore
index 511d972c..06dcf82f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 katsu-work/
+.DS_Store
\ No newline at end of file
diff --git a/README.md b/README.md
index a8769bba..fc5313d3 100644
--- a/README.md
+++ b/README.md
@@ -21,3 +21,82 @@ katsu -o iso katsu/modules/flagship/flagship-live.yaml
 Ultramarine also offers a minimal base Docker image, in rare cases when you want to run Ultramarine as a container.
 
 The image itself is similar to the vanilla Fedora image, but includes the Ultramarine Linux repositories and RPMFusion repositories. This may prove useful for some users who want a Fedora-like environment, but with some extra packages.
+
+## Status of Images (UM40)
+
+### Notes
+
+- Pantheon is not currently being built
+- Chromebook images are shown as failing due to me not setting them up to build yet
+
+### Flagship
+
+- ☓ x86 Live
+- ✓ ARM Live
+- ✓ x86 Preinstalled
+- ✓ ARM Preinstalled
+- ☓ x86 Chromebook
+- ☓ Chromebook mt8183
+- ☓ Chromebook mt8192
+- ☓ Chromebook SC-7C
+- ☓ Chromebook Stoney Ridge
+
+### GNOME
+
+- ☓ x86 Live
+- ✓ ARM Live
+- ✓ x86 Preinstalled
+- ✓ ARM Preinstalled
+- ☓ x86 Chromebook
+- ☓ Chromebook mt8183
+- ☓ Chromebook mt8192
+- ☓ Chromebook SC-7C
+- ☓ Chromebook Stoney Ridge
+
+### KDE
+
+- ☓ x86 Live
+- ✓ ARM Live
+- ✓ x86 Preinstalled
+- ✓ ARM Preinstalled
+- ☓ x86 Chromebook
+- ☓ Chromebook mt8183
+- ☓ Chromebook mt8192
+- ☓ Chromebook SC-7C
+- ☓ Chromebook Stoney Ridge
+
+### Pantheon
+
+- ☓ x86 Live
+- ☓ ARM Live
+- ☓ x86 Preinstalled
+- ☓ ARM Preinstalled
+- ☓ x86 Chromebook
+- ☓ Chromebook mt8183
+- ☓ Chromebook mt8192
+- ☓ Chromebook SC-7C
+- ☓ Chromebook Stoney Ridge
+
+### Xfce
+
+- ☓ x86 Live
+- ✓ ARM Live
+- ✓ x86 Preinstalled
+- ✓ ARM Preinstalled
+- ☓ x86 Chromebook
+- ☓ Chromebook mt8183
+- ☓ Chromebook mt8192
+- ☓ Chromebook SC-7C
+- ☓ Chromebook Stoney Ridge
+
+### Base/Preinstalled
+
+- ✓ x86
+- ✓ ARM
+
+### Docker
+
+- ✓ x86
+- ☓ ARM
+- ✓ x86 Devtools
+- ☓ ARM Devtools
diff --git a/katsu/modules/base/base-disk-aarch64.yaml b/katsu/modules/base/base-disk-aarch64.yaml
index 6c475bd6..2af4720a 100644
--- a/katsu/modules/base/base-disk-aarch64.yaml
+++ b/katsu/modules/base/base-disk-aarch64.yaml
@@ -12,6 +12,14 @@ import:
   - base.yaml
   - base-disk.yaml
 
+dnf:
+  releasever: 40
+  # options:
+  #   - --setopt=strict=0
+  arch: aarch64
+  packages:
+    - ultramarine-release-identity-basic
+    - ultramarine-release-basic
 scripts:
   post:
     - id: grub
@@ -35,7 +43,3 @@ disk:
       # size: 2.5MiB
       filesystem: ext4
       mountpoint: /
-
-dnf:
-  releasever: 40
-  arch: aarch64
diff --git a/katsu/modules/base/base-disk-x86_64.yaml b/katsu/modules/base/base-disk-x86_64.yaml
index 631bbbcb..32bfdb98 100644
--- a/katsu/modules/base/base-disk-x86_64.yaml
+++ b/katsu/modules/base/base-disk-x86_64.yaml
@@ -12,6 +12,14 @@ import:
   - base.yaml
   - base-disk.yaml
 
+dnf:
+  releasever: 40
+  # options:
+  #   - --setopt=strict=0
+  packages:
+    - ultramarine-release-identity-basic
+    - ultramarine-release-basic
+
 scripts:
   post:
     - id: grub
@@ -35,6 +43,3 @@ disk:
       # size: 2.5MiB
       filesystem: ext4
       mountpoint: /
-
-dnf:
-  releasever: 40
diff --git a/katsu/modules/base/base-disk.yaml b/katsu/modules/base/base-disk.yaml
index 562ff36c..d94fba55 100644
--- a/katsu/modules/base/base-disk.yaml
+++ b/katsu/modules/base/base-disk.yaml
@@ -1,5 +1,3 @@
-builder: dnf
-
 dnf:
   releasever: 40
   options:
@@ -31,8 +29,6 @@ dnf:
     - NetworkManager
     - rpm
     - libgomp
-    - ultramarine-release-identity-basic
-    - ultramarine-release-basic
     - fedora-repos
     - efibootmgr
 
diff --git a/katsu/modules/base/base-docker-aarch64.yaml b/katsu/modules/base/base-docker-aarch64.yaml
index 97c92c59..4ea61f53 100644
--- a/katsu/modules/base/base-docker-aarch64.yaml
+++ b/katsu/modules/base/base-docker-aarch64.yaml
@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40
+distro: Ultramarine Linux 40 Container
 
 import:
   - base-docker.yaml
diff --git a/katsu/modules/base/base-docker-x86_64.yaml b/katsu/modules/base/base-docker-x86_64.yaml
index 9e2ef2ac..80bca9a7 100644
--- a/katsu/modules/base/base-docker-x86_64.yaml
+++ b/katsu/modules/base/base-docker-x86_64.yaml
@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40
+distro: Ultramarine Linux 40 Container
 
 import:
   - base-docker.yaml
diff --git a/katsu/modules/base/cleanup.sh b/katsu/modules/base/cleanup.sh
index c436e9aa..d4452f64 100644
--- a/katsu/modules/base/cleanup.sh
+++ b/katsu/modules/base/cleanup.sh
@@ -34,4 +34,12 @@ rm -f /etc/NetworkManager/system-connections/*.nmconnection
 rm -f /etc/machine-id
 touch /etc/machine-id
 
-rm -f /var/lib/rpm/__db*
\ No newline at end of file
+rm -f /var/lib/rpm/__db*
+
+# Set up initial setup, might be redundant idk
+
+if [ rpm -q gnome-initial-setup ]; then
+    touch /var/lib/gdm/run-initial-setup || true
+else
+    systemctl enable initial-setup || true
+fi
\ No newline at end of file
diff --git a/katsu/modules/base/devtools-docker-aarch64.yaml b/katsu/modules/base/devtools-docker-aarch64.yaml
new file mode 100644
index 00000000..85a0bd93
--- /dev/null
+++ b/katsu/modules/base/devtools-docker-aarch64.yaml
@@ -0,0 +1,37 @@
+builder: dnf
+distro: Ultramarine Linux 40 Container (Development Tools)
+
+import:
+  - base-docker.yaml
+
+dnf:
+  releasever: 40
+  arch: aarch64
+packages:
+  #releng and packaging
+  - katsu
+  - anda
+  - anda-mock-configs
+  - anda-srpm-macros
+  - libostree
+  - rpm-ostree
+  #languages
+  - vala
+  - rust
+  - python3
+  - python3-pip
+  - nodejs
+  #hwe/anywhere
+  - vboot-utils
+  #gui
+  - libhelium
+  - libhelium-devel
+  - tau-helium
+  - tau-hydrogen
+  - gtk4-devel
+  - rust-gtk4-devel
+  #utils
+  - git
+  - micro
+  - nano
+  - vim
diff --git a/katsu/modules/base/devtools-docker-x86_64.yaml b/katsu/modules/base/devtools-docker-x86_64.yaml
new file mode 100644
index 00000000..c312bd2d
--- /dev/null
+++ b/katsu/modules/base/devtools-docker-x86_64.yaml
@@ -0,0 +1,37 @@
+builder: dnf
+distro: Ultramarine Linux 40 Container (Development Tools)
+
+import:
+  - base-docker.yaml
+
+dnf:
+  releasever: 40
+  arch: x86_64
+packages:
+  #releng and packaging
+  - katsu
+  - anda
+  - anda-mock-configs
+  - anda-srpm-macros
+  - libostree
+  - rpm-ostree
+  #languages
+  - vala
+  - rust
+  - python3
+  - python3-pip
+  - nodejs
+  #hwe/anywhere
+  - vboot-utils
+  #gui
+  - libhelium
+  - libhelium-devel
+  - tau-helium
+  - tau-hydrogen
+  - gtk4-devel
+  - rust-gtk4-devel
+  #utils
+  - git
+  - micro
+  - nano
+  - vim
diff --git a/katsu/modules/base/grub-setup.sh b/katsu/modules/base/grub-setup.sh
index 65cc49be..9405f927 100644
--- a/katsu/modules/base/grub-setup.sh
+++ b/katsu/modules/base/grub-setup.sh
@@ -36,7 +36,8 @@ EOF
 
 sed -i 's/ ro  / rw  /g' /boot/loader/entries/*.conf
 
-dracut -vfN --add-drivers "virtio virtio_blk virtio_scsi xchi_pci mmc" --regenerate-all
+# -v will fill up the logs and make it hard to debug
+dracut -fN --add-drivers "virtio virtio_blk virtio_scsi xchi_pci mmc" --regenerate-all
 
 arch=$(uname -m)
 if [[ $arch == "aarch64" ]]; then
@@ -50,4 +51,4 @@ rm -f /etc/NetworkManager/system-connections/*.nmconnection
 rm -f /etc/machine-id
 touch /etc/machine-id
 
-rm -f /var/lib/rpm/__db*
\ No newline at end of file
+rm -f /var/lib/rpm/__db*
diff --git a/katsu/modules/chromebook/base-cbe-kernel.yaml b/katsu/modules/chromebook/base-cbe-kernel.yaml
new file mode 100644
index 00000000..da3c1102
--- /dev/null
+++ b/katsu/modules/chromebook/base-cbe-kernel.yaml
@@ -0,0 +1,47 @@
+scripts:
+  post:
+    - id: cleanup
+      name: Clean up system
+      file: ../base/cleanup.sh
+    - id: selinux-setup
+      name: Set up SELinux
+      file: ../base/selinux.sh
+    - id: buildstamp
+      name: Generate buildstamp
+      file: ../base/buildstamp.sh
+    - id: submarine
+      name: Set up ChromeOS bootloader
+      file: submarine.sh
+
+dnf:
+  releasever: 39
+  repodir: ./repodir-mtest
+  options:
+    - --setopt=cachedir=/var/cache/dnf
+    - --nogpgcheck
+    - --setopt=keepcache=True
+    - --best
+    - --allowerasing
+  exclude:
+    - fedora-release*
+    - generic-release*
+    - kernel-debug*
+    - setroubleshoot
+    - setroubleshoot-plugins
+    - setroubleshoot-server
+    - kernel
+    - kernel-devel
+    - kernel-core
+  arch_packages:
+    aarch64:
+      - bcm283x-firmware
+      - bcm283x-overlays
+      - "@arm-tools"
+    x86_64:
+      - grub2-pc
+      - grub2-pc-modules
+  packages:
+    - depthcharge-tools
+    - alsa-ucm-cros
+    - submarine
+    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/base-cbe-mt8183.yaml b/katsu/modules/chromebook/base-cbe-mt8183.yaml
new file mode 100644
index 00000000..da3c1102
--- /dev/null
+++ b/katsu/modules/chromebook/base-cbe-mt8183.yaml
@@ -0,0 +1,47 @@
+scripts:
+  post:
+    - id: cleanup
+      name: Clean up system
+      file: ../base/cleanup.sh
+    - id: selinux-setup
+      name: Set up SELinux
+      file: ../base/selinux.sh
+    - id: buildstamp
+      name: Generate buildstamp
+      file: ../base/buildstamp.sh
+    - id: submarine
+      name: Set up ChromeOS bootloader
+      file: submarine.sh
+
+dnf:
+  releasever: 39
+  repodir: ./repodir-mtest
+  options:
+    - --setopt=cachedir=/var/cache/dnf
+    - --nogpgcheck
+    - --setopt=keepcache=True
+    - --best
+    - --allowerasing
+  exclude:
+    - fedora-release*
+    - generic-release*
+    - kernel-debug*
+    - setroubleshoot
+    - setroubleshoot-plugins
+    - setroubleshoot-server
+    - kernel
+    - kernel-devel
+    - kernel-core
+  arch_packages:
+    aarch64:
+      - bcm283x-firmware
+      - bcm283x-overlays
+      - "@arm-tools"
+    x86_64:
+      - grub2-pc
+      - grub2-pc-modules
+  packages:
+    - depthcharge-tools
+    - alsa-ucm-cros
+    - submarine
+    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/base-cbe-mt8192.yaml b/katsu/modules/chromebook/base-cbe-mt8192.yaml
new file mode 100644
index 00000000..da3c1102
--- /dev/null
+++ b/katsu/modules/chromebook/base-cbe-mt8192.yaml
@@ -0,0 +1,47 @@
+scripts:
+  post:
+    - id: cleanup
+      name: Clean up system
+      file: ../base/cleanup.sh
+    - id: selinux-setup
+      name: Set up SELinux
+      file: ../base/selinux.sh
+    - id: buildstamp
+      name: Generate buildstamp
+      file: ../base/buildstamp.sh
+    - id: submarine
+      name: Set up ChromeOS bootloader
+      file: submarine.sh
+
+dnf:
+  releasever: 39
+  repodir: ./repodir-mtest
+  options:
+    - --setopt=cachedir=/var/cache/dnf
+    - --nogpgcheck
+    - --setopt=keepcache=True
+    - --best
+    - --allowerasing
+  exclude:
+    - fedora-release*
+    - generic-release*
+    - kernel-debug*
+    - setroubleshoot
+    - setroubleshoot-plugins
+    - setroubleshoot-server
+    - kernel
+    - kernel-devel
+    - kernel-core
+  arch_packages:
+    aarch64:
+      - bcm283x-firmware
+      - bcm283x-overlays
+      - "@arm-tools"
+    x86_64:
+      - grub2-pc
+      - grub2-pc-modules
+  packages:
+    - depthcharge-tools
+    - alsa-ucm-cros
+    - submarine
+    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/base-cbe-sc7180.yaml b/katsu/modules/chromebook/base-cbe-sc7180.yaml
new file mode 100644
index 00000000..da3c1102
--- /dev/null
+++ b/katsu/modules/chromebook/base-cbe-sc7180.yaml
@@ -0,0 +1,47 @@
+scripts:
+  post:
+    - id: cleanup
+      name: Clean up system
+      file: ../base/cleanup.sh
+    - id: selinux-setup
+      name: Set up SELinux
+      file: ../base/selinux.sh
+    - id: buildstamp
+      name: Generate buildstamp
+      file: ../base/buildstamp.sh
+    - id: submarine
+      name: Set up ChromeOS bootloader
+      file: submarine.sh
+
+dnf:
+  releasever: 39
+  repodir: ./repodir-mtest
+  options:
+    - --setopt=cachedir=/var/cache/dnf
+    - --nogpgcheck
+    - --setopt=keepcache=True
+    - --best
+    - --allowerasing
+  exclude:
+    - fedora-release*
+    - generic-release*
+    - kernel-debug*
+    - setroubleshoot
+    - setroubleshoot-plugins
+    - setroubleshoot-server
+    - kernel
+    - kernel-devel
+    - kernel-core
+  arch_packages:
+    aarch64:
+      - bcm283x-firmware
+      - bcm283x-overlays
+      - "@arm-tools"
+    x86_64:
+      - grub2-pc
+      - grub2-pc-modules
+  packages:
+    - depthcharge-tools
+    - alsa-ucm-cros
+    - submarine
+    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/base-cbe-stoneyridge.yaml b/katsu/modules/chromebook/base-cbe-stoneyridge.yaml
new file mode 100644
index 00000000..da3c1102
--- /dev/null
+++ b/katsu/modules/chromebook/base-cbe-stoneyridge.yaml
@@ -0,0 +1,47 @@
+scripts:
+  post:
+    - id: cleanup
+      name: Clean up system
+      file: ../base/cleanup.sh
+    - id: selinux-setup
+      name: Set up SELinux
+      file: ../base/selinux.sh
+    - id: buildstamp
+      name: Generate buildstamp
+      file: ../base/buildstamp.sh
+    - id: submarine
+      name: Set up ChromeOS bootloader
+      file: submarine.sh
+
+dnf:
+  releasever: 39
+  repodir: ./repodir-mtest
+  options:
+    - --setopt=cachedir=/var/cache/dnf
+    - --nogpgcheck
+    - --setopt=keepcache=True
+    - --best
+    - --allowerasing
+  exclude:
+    - fedora-release*
+    - generic-release*
+    - kernel-debug*
+    - setroubleshoot
+    - setroubleshoot-plugins
+    - setroubleshoot-server
+    - kernel
+    - kernel-devel
+    - kernel-core
+  arch_packages:
+    aarch64:
+      - bcm283x-firmware
+      - bcm283x-overlays
+      - "@arm-tools"
+    x86_64:
+      - grub2-pc
+      - grub2-pc-modules
+  packages:
+    - depthcharge-tools
+    - alsa-ucm-cros
+    - submarine
+    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/base-cbe.yaml b/katsu/modules/chromebook/base-cbe.yaml
index ed90ab3c..79229ce6 100644
--- a/katsu/modules/chromebook/base-cbe.yaml
+++ b/katsu/modules/chromebook/base-cbe.yaml
@@ -40,4 +40,5 @@ dnf:
   packages:
     - depthcharge-tools
     - alsa-ucm-cros
+    - cros-keyboard-map
     # - submarine
diff --git a/katsu/modules/chromebook/live-cbe-kernel.yaml b/katsu/modules/chromebook/live-cbe-kernel.yaml
new file mode 100644
index 00000000..37fb9c42
--- /dev/null
+++ b/katsu/modules/chromebook/live-cbe-kernel.yaml
@@ -0,0 +1,72 @@
+builder: dnf
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 14GiB
+  partitions:
+    - label: submarine
+      size: 64MiB
+      filesystem: efi
+      mountpoint: /mnt
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 39
+    - fcoe-utils
+    - device-mapper-multipath
+    - gnome-boxes
+    - deepin-wallpapers
+    - initial-setup-gui
+    - initial-setup
+  packages:
+    - python3-umstellar
+    - glibc-all-langpacks
+    - dracut-config-generic
+    - dracut-live
+    - dracut-config-generic
+    - dracut-network
+    - anaconda-dracut
+    - dracut-squash
+    - anaconda-live
+    - "@anaconda-tools"
+    - libblockdev-nvdimm
+    - isomd5sum
+    - orca
+    - espeak-ng
+    - speech-dispatcher-espeak-ng
+    - julietaula-montserrat-fonts
+    - ultramarine-backgrounds
+    - initscripts
+    - chkconfig
+    - gjs
+    - util-linux-user
+    - livesys-scripts
+    - rsync
+    - htop
+    - vim
+    - nano
+    # for drivers and other stuff
+    - kernel-chromebook
+    - kernel-chromebook-devel
+    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/live-cbe-mt8183.yaml b/katsu/modules/chromebook/live-cbe-mt8183.yaml
new file mode 100644
index 00000000..2d09fcc4
--- /dev/null
+++ b/katsu/modules/chromebook/live-cbe-mt8183.yaml
@@ -0,0 +1,72 @@
+builder: dnf
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 14GiB
+  partitions:
+    - label: submarine
+      size: 64MiB
+      filesystem: efi
+      mountpoint: /mnt
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 39
+    - fcoe-utils
+    - device-mapper-multipath
+    - gnome-boxes
+    - deepin-wallpapers
+    - initial-setup-gui
+    - initial-setup
+  packages:
+    - python3-umstellar
+    - glibc-all-langpacks
+    - dracut-config-generic
+    - dracut-live
+    - dracut-config-generic
+    - dracut-network
+    - anaconda-dracut
+    - dracut-squash
+    - anaconda-live
+    - "@anaconda-tools"
+    - libblockdev-nvdimm
+    - isomd5sum
+    - orca
+    - espeak-ng
+    - speech-dispatcher-espeak-ng
+    - julietaula-montserrat-fonts
+    - ultramarine-backgrounds
+    - initscripts
+    - chkconfig
+    - gjs
+    - util-linux-user
+    - livesys-scripts
+    - rsync
+    - htop
+    - vim
+    - nano
+    # for drivers and other stuff
+    - kernel-mt8183
+    - kernel-mt8183-devel
+    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/live-cbe-mt8192.yaml b/katsu/modules/chromebook/live-cbe-mt8192.yaml
new file mode 100644
index 00000000..6a82ffce
--- /dev/null
+++ b/katsu/modules/chromebook/live-cbe-mt8192.yaml
@@ -0,0 +1,72 @@
+builder: dnf
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 14GiB
+  partitions:
+    - label: submarine
+      size: 64MiB
+      filesystem: efi
+      mountpoint: /mnt
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 39
+    - fcoe-utils
+    - device-mapper-multipath
+    - gnome-boxes
+    - deepin-wallpapers
+    - initial-setup-gui
+    - initial-setup
+  packages:
+    - python3-umstellar
+    - glibc-all-langpacks
+    - dracut-config-generic
+    - dracut-live
+    - dracut-config-generic
+    - dracut-network
+    - anaconda-dracut
+    - dracut-squash
+    - anaconda-live
+    - "@anaconda-tools"
+    - libblockdev-nvdimm
+    - isomd5sum
+    - orca
+    - espeak-ng
+    - speech-dispatcher-espeak-ng
+    - julietaula-montserrat-fonts
+    - ultramarine-backgrounds
+    - initscripts
+    - chkconfig
+    - gjs
+    - util-linux-user
+    - livesys-scripts
+    - rsync
+    - htop
+    - vim
+    - nano
+    # for drivers and other stuff
+    - kernel-mt8192
+    - kernel-mt8192-devel
+    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/live-cbe-sc7180.yaml b/katsu/modules/chromebook/live-cbe-sc7180.yaml
new file mode 100644
index 00000000..caf98a97
--- /dev/null
+++ b/katsu/modules/chromebook/live-cbe-sc7180.yaml
@@ -0,0 +1,72 @@
+builder: dnf
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 14GiB
+  partitions:
+    - label: submarine
+      size: 64MiB
+      filesystem: efi
+      mountpoint: /mnt
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 39
+    - fcoe-utils
+    - device-mapper-multipath
+    - gnome-boxes
+    - deepin-wallpapers
+    - initial-setup-gui
+    - initial-setup
+  packages:
+    - python3-umstellar
+    - glibc-all-langpacks
+    - dracut-config-generic
+    - dracut-live
+    - dracut-config-generic
+    - dracut-network
+    - anaconda-dracut
+    - dracut-squash
+    - anaconda-live
+    - "@anaconda-tools"
+    - libblockdev-nvdimm
+    - isomd5sum
+    - orca
+    - espeak-ng
+    - speech-dispatcher-espeak-ng
+    - julietaula-montserrat-fonts
+    - ultramarine-backgrounds
+    - initscripts
+    - chkconfig
+    - gjs
+    - util-linux-user
+    - livesys-scripts
+    - rsync
+    - htop
+    - vim
+    - nano
+    # for drivers and other stuff
+    - kernel-sc7180
+    - kernel-sc7180-devel
+    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/live-cbe-stoneyridge.yaml b/katsu/modules/chromebook/live-cbe-stoneyridge.yaml
new file mode 100644
index 00000000..12ded931
--- /dev/null
+++ b/katsu/modules/chromebook/live-cbe-stoneyridge.yaml
@@ -0,0 +1,72 @@
+builder: dnf
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 14GiB
+  partitions:
+    - label: submarine
+      size: 64MiB
+      filesystem: efi
+      mountpoint: /mnt
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 39
+    - fcoe-utils
+    - device-mapper-multipath
+    - gnome-boxes
+    - deepin-wallpapers
+    - initial-setup-gui
+    - initial-setup
+  packages:
+    - python3-umstellar
+    - glibc-all-langpacks
+    - dracut-config-generic
+    - dracut-live
+    - dracut-config-generic
+    - dracut-network
+    - anaconda-dracut
+    - dracut-squash
+    - anaconda-live
+    - "@anaconda-tools"
+    - libblockdev-nvdimm
+    - isomd5sum
+    - orca
+    - espeak-ng
+    - speech-dispatcher-espeak-ng
+    - julietaula-montserrat-fonts
+    - ultramarine-backgrounds
+    - initscripts
+    - chkconfig
+    - gjs
+    - util-linux-user
+    - livesys-scripts
+    - rsync
+    - htop
+    - vim
+    - nano
+    # for drivers and other stuff
+    - kernel-stoneyridge
+    - kernel-stoneyridge-devel
+    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/live-cbe.yaml b/katsu/modules/chromebook/live-cbe.yaml
index 2b70cda0..2ac14e1a 100644
--- a/katsu/modules/chromebook/live-cbe.yaml
+++ b/katsu/modules/chromebook/live-cbe.yaml
@@ -66,6 +66,9 @@ dnf:
     - htop
     - vim
     - nano
+    - kernel-chromebook
+    #- cros-keyboard-map
     # for drivers and other stuff
     - kernel
     - kernel-devel-matched
+    - cros-keyboard-map
diff --git a/katsu/modules/chromebook/repodir-mtest/fedora-cisco-openh264.repo b/katsu/modules/chromebook/repodir-mtest/fedora-cisco-openh264.repo
new file mode 100644
index 00000000..02150d97
--- /dev/null
+++ b/katsu/modules/chromebook/repodir-mtest/fedora-cisco-openh264.repo
@@ -0,0 +1,22 @@
+[fedora-cisco-openh264]
+name=Fedora $releasever openh264 (From Cisco) - $basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-$releasever&arch=$basearch
+type=rpm
+enabled=1
+metadata_expire=14d
+repo_gpgcheck=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=True
+
+[fedora-cisco-openh264-debuginfo]
+name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-debug-$releasever&arch=$basearch
+type=rpm
+enabled=0
+metadata_expire=14d
+repo_gpgcheck=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=True
+
diff --git a/katsu/modules/chromebook/repodir-mtest/fedora-updates.repo b/katsu/modules/chromebook/repodir-mtest/fedora-updates.repo
new file mode 100644
index 00000000..9d9f2fd4
--- /dev/null
+++ b/katsu/modules/chromebook/repodir-mtest/fedora-updates.repo
@@ -0,0 +1,36 @@
+[updates]
+name=Fedora $releasever - $basearch - Updates
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+enabled=1
+countme=1
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[updates-debuginfo]
+name=Fedora $releasever - $basearch - Updates - Debug
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[updates-source]
+name=Fedora $releasever - Updates Source
+#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
+enabled=0
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+metadata_expire=6h
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
diff --git a/katsu/modules/chromebook/repodir-mtest/fedora.repo b/katsu/modules/chromebook/repodir-mtest/fedora.repo
new file mode 100644
index 00000000..f9bfbb17
--- /dev/null
+++ b/katsu/modules/chromebook/repodir-mtest/fedora.repo
@@ -0,0 +1,36 @@
+[fedora]
+name=Fedora $releasever - $basearch
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+enabled=1
+countme=1
+metadata_expire=7d
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[fedora-debuginfo]
+name=Fedora $releasever - $basearch - Debug
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
+[fedora-source]
+name=Fedora $releasever - Source
+#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+repo_gpgcheck=0
+type=rpm
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
diff --git a/katsu/modules/chromebook/repodir-mtest/mtest.repo b/katsu/modules/chromebook/repodir-mtest/mtest.repo
new file mode 100644
index 00000000..3170d52b
--- /dev/null
+++ b/katsu/modules/chromebook/repodir-mtest/mtest.repo
@@ -0,0 +1,12 @@
+[mtest]
+name=mtest
+baseurl=https://repos.fyralabs.com/mtest
+metadata_expire=6h
+type=rpm
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://repos.fyralabs.com/mtest/key.asc
+repo_gpgcheck=1
+enabled=1
+enabled_metadata=1
+priority=1
\ No newline at end of file
diff --git a/katsu/modules/chromebook/repodir-mtest/rpmfusion-free-tainted.repo b/katsu/modules/chromebook/repodir-mtest/rpmfusion-free-tainted.repo
new file mode 100644
index 00000000..906bf6fd
--- /dev/null
+++ b/katsu/modules/chromebook/repodir-mtest/rpmfusion-free-tainted.repo
@@ -0,0 +1,33 @@
+[rpmfusion-free-tainted]
+name=RPM Fusion for Fedora $releasever - Free tainted
+#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-$releasever&arch=$basearch
+enabled=1
+metadata_expire=6h
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
+
+[rpmfusion-free-tainted-debuginfo]
+name=RPM Fusion for Fedora $releasever - Free tainted - Debug
+#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-debug-$releasever&arch=$basearch
+enabled=0
+metadata_expire=6h
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
+
+[rpmfusion-free-tainted-source]
+name=RPM Fusion for Fedora $releasever - Free tainted - Source
+#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-source-$releasever&arch=$basearch
+enabled=0
+metadata_expire=6h
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
+
diff --git a/katsu/modules/chromebook/repodir-mtest/rpmfusion-free-updates.repo b/katsu/modules/chromebook/repodir-mtest/rpmfusion-free-updates.repo
new file mode 100644
index 00000000..14059315
--- /dev/null
+++ b/katsu/modules/chromebook/repodir-mtest/rpmfusion-free-updates.repo
@@ -0,0 +1,31 @@
+[rpmfusion-free-updates]
+name=RPM Fusion for Fedora $releasever - Free - Updates
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
+enabled=1
+enabled_metadata=1
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
+
+[rpmfusion-free-updates-debuginfo]
+name=RPM Fusion for Fedora $releasever - Free - Updates Debug
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch
+enabled=0
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
+
+[rpmfusion-free-updates-source]
+name=RPM Fusion for Fedora $releasever - Free - Updates Source
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch
+enabled=0
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
+
diff --git a/katsu/modules/chromebook/repodir-mtest/rpmfusion-free.repo b/katsu/modules/chromebook/repodir-mtest/rpmfusion-free.repo
new file mode 100644
index 00000000..e65aa5bc
--- /dev/null
+++ b/katsu/modules/chromebook/repodir-mtest/rpmfusion-free.repo
@@ -0,0 +1,33 @@
+[rpmfusion-free]
+name=RPM Fusion for Fedora $releasever - Free
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
+enabled=1
+metadata_expire=14d
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
+
+[rpmfusion-free-debuginfo]
+name=RPM Fusion for Fedora $releasever - Free - Debug
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
+
+[rpmfusion-free-source]
+name=RPM Fusion for Fedora $releasever - Free - Source
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/source/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
+
diff --git a/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree-tainted.repo b/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree-tainted.repo
new file mode 100644
index 00000000..ee408aa7
--- /dev/null
+++ b/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree-tainted.repo
@@ -0,0 +1,33 @@
+[rpmfusion-nonfree-tainted]
+name=RPM Fusion for Fedora $releasever - Nonfree tainted
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-$releasever&arch=$basearch
+enabled=1
+metadata_expire=14d
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
+
+[rpmfusion-nonfree-tainted-debuginfo]
+name=RPM Fusion for Fedora $releasever - Nonfree tainted - Debug
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-debug-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
+
+[rpmfusion-nonfree-tainted-source]
+name=RPM Fusion for Fedora $releasever - Nonfree tainted - Source
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-source-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
+
diff --git a/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree-updates.repo b/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree-updates.repo
new file mode 100644
index 00000000..6d4d8251
--- /dev/null
+++ b/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree-updates.repo
@@ -0,0 +1,31 @@
+[rpmfusion-nonfree-updates]
+name=RPM Fusion for Fedora $releasever - Nonfree - Updates
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
+enabled=1
+enabled_metadata=1
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
+
+[rpmfusion-nonfree-updates-debuginfo]
+name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch
+enabled=0
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
+
+[rpmfusion-nonfree-updates-source]
+name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch
+enabled=0
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
+
diff --git a/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree.repo b/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree.repo
new file mode 100644
index 00000000..dfb5110a
--- /dev/null
+++ b/katsu/modules/chromebook/repodir-mtest/rpmfusion-nonfree.repo
@@ -0,0 +1,34 @@
+[rpmfusion-nonfree]
+name=RPM Fusion for Fedora $releasever - Nonfree
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
+enabled=1
+enabled_metadata=1
+metadata_expire=14d
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
+
+[rpmfusion-nonfree-debuginfo]
+name=RPM Fusion for Fedora $releasever - Nonfree - Debug
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-debug-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
+
+[rpmfusion-nonfree-source]
+name=RPM Fusion for Fedora $releasever - Nonfree - Source
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/source/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-source-$releasever&arch=$basearch
+enabled=0
+metadata_expire=7d
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
+
diff --git a/katsu/modules/chromebook/repodir-mtest/terra.repo b/katsu/modules/chromebook/repodir-mtest/terra.repo
new file mode 100644
index 00000000..1c61569f
--- /dev/null
+++ b/katsu/modules/chromebook/repodir-mtest/terra.repo
@@ -0,0 +1,11 @@
+[terra]
+name=Terra Packages $releasever
+baseurl=https://repos.fyralabs.com/terra$releasever
+metadata_expire=6h
+type=rpm
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
+repo_gpgcheck=1
+enabled=1
+enabled_metadata=1
\ No newline at end of file
diff --git a/katsu/modules/chromebook/repodir-mtest/ultramarine.repo b/katsu/modules/chromebook/repodir-mtest/ultramarine.repo
new file mode 100644
index 00000000..316c5464
--- /dev/null
+++ b/katsu/modules/chromebook/repodir-mtest/ultramarine.repo
@@ -0,0 +1,11 @@
+[ultramarine]
+name=Ultramarine Linux $releasever
+baseurl=https://repos.fyralabs.com/um$releasever
+metadata_expire=6h
+type=rpm
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://repos.fyralabs.com/um$releasever/key.asc
+repo_gpgcheck=1
+enabled=1
+enabled_metadata=1
\ No newline at end of file
diff --git a/katsu/modules/chromebook/submarine.sh b/katsu/modules/chromebook/submarine.sh
index 63a1ad75..da1ddd67 100644
--- a/katsu/modules/chromebook/submarine.sh
+++ b/katsu/modules/chromebook/submarine.sh
@@ -11,7 +11,14 @@ umount $blpart
 sed -i '/mnt/d' /etc/fstab
 
 # Flash bootloader
-# dd if=/path/to/submarine.kpart of=$blpart
+submarine="/usr/share/submarine/submarine"
+if [ $(uname -m ) == 'x86_64' ]; then
+    submarine="$submarine-x86.kpart"
+elif [ $(uname -m ) == 'aarch64' ]; then
+    submarine="$submarine-a64.kpart"
+fi
+
+dd if=$submarine of=$blpart
 cgpt add -i $partnum -t kernel -P 15 -T 1 -S 1 /dev/$rootdev
 
 # Workaround for katsu trying to unmount /mnt
diff --git a/katsu/modules/flagship/base-disk-aarch64.yaml b/katsu/modules/flagship/base-disk-aarch64.yaml
new file mode 100644
index 00000000..636a8256
--- /dev/null
+++ b/katsu/modules/flagship/base-disk-aarch64.yaml
@@ -0,0 +1,42 @@
+builder: dnf
+distro: Ultramarine Linux 40 (Flagship Edition)
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+import:
+  - ../base/base.yaml
+  - ../base/base-disk.yaml
+  - flagship.yaml
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 11GiB
+  partitions:
+    - label: EFI
+      size: 512MiB
+      filesystem: efi
+      mountpoint: /boot/efi
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 40
+  arch: aarch64
diff --git a/katsu/modules/flagship/base-disk-x86_64.yaml b/katsu/modules/flagship/base-disk-x86_64.yaml
new file mode 100644
index 00000000..d0285bba
--- /dev/null
+++ b/katsu/modules/flagship/base-disk-x86_64.yaml
@@ -0,0 +1,41 @@
+builder: dnf
+distro: Ultramarine Linux 40 (Flagship Edition)
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+import:
+  - ../base/base.yaml
+  - ../base/base-disk.yaml
+  - flagship.yaml
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 10GiB
+  partitions:
+    - label: EFI
+      size: 512MiB
+      filesystem: efi
+      mountpoint: /boot/efi
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/flagship/flagship-chromebook-kernel.yaml b/katsu/modules/flagship/flagship-chromebook-kernel.yaml
new file mode 100644
index 00000000..d261aefd
--- /dev/null
+++ b/katsu/modules/flagship/flagship-chromebook-kernel.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-kernel.yaml
+  - ../chromebook/live-cbe-kernel.yaml
+  - flagship.yaml
+
+distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
+
+out_file: ultramarine-cbe-flagship-40-live.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/flagship/flagship-chromebook-mt8183.yaml b/katsu/modules/flagship/flagship-chromebook-mt8183.yaml
new file mode 100644
index 00000000..c6f2c4e4
--- /dev/null
+++ b/katsu/modules/flagship/flagship-chromebook-mt8183.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-mt8183.yaml
+  - ../chromebook/live-cbe-mt8183.yaml
+  - flagship.yaml
+
+distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
+
+out_file: ultramarine-cbe-mt8183-flagship-40-live.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/flagship/flagship-chromebook-mt8192.yaml b/katsu/modules/flagship/flagship-chromebook-mt8192.yaml
new file mode 100644
index 00000000..ba16445b
--- /dev/null
+++ b/katsu/modules/flagship/flagship-chromebook-mt8192.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-mt8192.yaml
+  - ../chromebook/live-cbe-mt8192.yaml
+  - flagship.yaml
+
+distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
+
+out_file: ultramarine-cbe-mt8192-flagship-40-live.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/flagship/flagship-chromebook-sc7180.yaml b/katsu/modules/flagship/flagship-chromebook-sc7180.yaml
new file mode 100644
index 00000000..a3248728
--- /dev/null
+++ b/katsu/modules/flagship/flagship-chromebook-sc7180.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-sc7180.yaml
+  - ../chromebook/live-cbe-sc7180.yaml
+  - flagship.yaml
+
+distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
+
+out_file: ultramarine-cbe-sc7c-flagship-40-live.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/flagship/flagship-chromebook-stoneyridge.yaml b/katsu/modules/flagship/flagship-chromebook-stoneyridge.yaml
new file mode 100644
index 00000000..8c0d6098
--- /dev/null
+++ b/katsu/modules/flagship/flagship-chromebook-stoneyridge.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-stoneyridge.yaml
+  - ../chromebook/live-cbe-stoneyridge.yaml
+  - flagship.yaml
+
+distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
+
+out_file: ultramarine-cbe-stoney-flagship-40-live.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/flagship/flagship-chromebook-x86-64.yaml b/katsu/modules/flagship/flagship-chromebook-x86-64.yaml
new file mode 100644
index 00000000..bb0e02f1
--- /dev/null
+++ b/katsu/modules/flagship/flagship-chromebook-x86-64.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe.yaml
+  - ../chromebook/live-cbe.yaml
+  - flagship.yaml
+
+distro: Ultramarine Linux 40 Flagship (Chromebook Edition)
+
+out_file: ultramarine-cbe-flagship-40-live.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/flagship/flagship-chromebook.yaml b/katsu/modules/flagship/flagship-chromebook.yaml
deleted file mode 100644
index 7be7f8f9..00000000
--- a/katsu/modules/flagship/flagship-chromebook.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe.yaml
-  - ../chromebook/live-cbe.yaml
-
-distro: Ultramarine CBE Flagship 40
-
-out_file: ultramarine-cbe-flagship-40-live.img
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
-  # options:
-  #   - --setopt=strict=0
-  exclude:
-    - budgie-desktop-defaults
-    - budgie-backgrounds
-  packages:
-    - "@ultramarine-flagship-product-environment"
-#scripts:
-#  post:
-#    - id: flagship-live
-#      name: Set up Flagship Live
-#      file: ./flagship-live.sh
diff --git a/katsu/modules/flagship/flagship-live.yaml b/katsu/modules/flagship/flagship-live.yaml
index 1bcd35c8..3d585707 100644
--- a/katsu/modules/flagship/flagship-live.yaml
+++ b/katsu/modules/flagship/flagship-live.yaml
@@ -3,8 +3,9 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
+  - flagship.yaml
 
-distro: Ultramarine Flagship 40
+distro: Ultramarine Linux 40 (Flagship Edition)
 
 out_file: ultramarine-flagship-40-live.iso
 
@@ -13,20 +14,13 @@ bootloader: grub
 kernel_cmdline: "quiet rhgb"
 
 iso:
-  volume_id: UM-Fl-Live
-
-dnf:
-  releasever: 40
-  # options:
-  #   - --setopt=strict=0
-  exclude:
-    - budgie-desktop-defaults
-    - budgie-backgrounds
-  packages:
-    - "@ultramarine-flagship-product-environment"
+  volume_id: UM-Flagship-Live
 
 scripts:
   post:
     - id: flagship-live
       name: Set up Flagship Live
       file: ./flagship-live.sh
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/flagship/flagship.yaml b/katsu/modules/flagship/flagship.yaml
new file mode 100644
index 00000000..7e432b69
--- /dev/null
+++ b/katsu/modules/flagship/flagship.yaml
@@ -0,0 +1,9 @@
+dnf:
+  releasever: 40
+  # options:
+  #   - --setopt=strict=0
+  exclude:
+    - budgie-desktop-defaults
+    - budgie-backgrounds
+  packages:
+    - "@ultramarine-flagship-product-environment"
diff --git a/katsu/modules/gnome/base-disk-aarch64.yaml b/katsu/modules/gnome/base-disk-aarch64.yaml
new file mode 100644
index 00000000..37043b80
--- /dev/null
+++ b/katsu/modules/gnome/base-disk-aarch64.yaml
@@ -0,0 +1,42 @@
+builder: dnf
+distro: Ultramarine Linux 40 (GNOME Edition)
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+import:
+  - ../base/base.yaml
+  - ../base/base-disk.yaml
+  - gnome.yaml
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 11GiB
+  partitions:
+    - label: EFI
+      size: 512MiB
+      filesystem: efi
+      mountpoint: /boot/efi
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 40
+  arch: aarch64
diff --git a/katsu/modules/gnome/base-disk-x86_64.yaml b/katsu/modules/gnome/base-disk-x86_64.yaml
new file mode 100644
index 00000000..6e533bd8
--- /dev/null
+++ b/katsu/modules/gnome/base-disk-x86_64.yaml
@@ -0,0 +1,41 @@
+builder: dnf
+distro: Ultramarine Linux 40 (GNOME Edition)
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+import:
+  - ../base/base.yaml
+  - ../base/base-disk.yaml
+  - gnome.yaml
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 10GiB
+  partitions:
+    - label: EFI
+      size: 512MiB
+      filesystem: efi
+      mountpoint: /boot/efi
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/gnome/gnome-chromebook-kernel.yaml b/katsu/modules/gnome/gnome-chromebook-kernel.yaml
new file mode 100644
index 00000000..fdddb988
--- /dev/null
+++ b/katsu/modules/gnome/gnome-chromebook-kernel.yaml
@@ -0,0 +1,23 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-kernel.yaml
+  - ../chromebook/live-cbe-kernel.yaml
+  - gnome.yaml
+
+out_file: ultramarine-cbe-gnome-40-live.iso
+
+#  scripts:
+#  post:
+#    - id: gnome-live
+#      name: Set up GNOME Live
+#      file: gnome-live.sh
+
+distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/gnome/gnome-chromebook-mt8183.yaml b/katsu/modules/gnome/gnome-chromebook-mt8183.yaml
new file mode 100644
index 00000000..e32771d6
--- /dev/null
+++ b/katsu/modules/gnome/gnome-chromebook-mt8183.yaml
@@ -0,0 +1,23 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-mt8183.yaml
+  - ../chromebook/live-cbe-mt8183.yaml
+  - gnome.yaml
+
+out_file: ultramarine-cbe-mt8183-gnome-40-live.iso
+
+#  scripts:
+#  post:
+#    - id: gnome-live
+#      name: Set up GNOME Live
+#      file: gnome-live.sh
+
+distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/gnome/gnome-chromebook.yaml b/katsu/modules/gnome/gnome-chromebook-mt8192.yaml
similarity index 70%
rename from katsu/modules/gnome/gnome-chromebook.yaml
rename to katsu/modules/gnome/gnome-chromebook-mt8192.yaml
index cd901b81..8044eff6 100644
--- a/katsu/modules/gnome/gnome-chromebook.yaml
+++ b/katsu/modules/gnome/gnome-chromebook-mt8192.yaml
@@ -1,10 +1,11 @@
 builder: dnf
 
 import:
-  - ../chromebook/base-cbe.yaml
-  - ../chromebook/live-cbe.yaml
+  - ../chromebook/base-cbe-mt8192.yaml
+  - ../chromebook/live-cbe-mt8192.yaml
+  - gnome.yaml
 
-out_file: ultramarine-cbe-gnome-40-live.iso
+out_file: ultramarine-cbe-mt8192-gnome-40-live.iso
 
 #  scripts:
 #  post:
@@ -12,7 +13,7 @@ out_file: ultramarine-cbe-gnome-40-live.iso
 #      name: Set up GNOME Live
 #      file: gnome-live.sh
 
-distro: Ultramarine CBE GNOME 40
+distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
 
 bootloader: grub
 
diff --git a/katsu/modules/gnome/gnome-chromebook-sc7180.yaml b/katsu/modules/gnome/gnome-chromebook-sc7180.yaml
new file mode 100644
index 00000000..047a9e47
--- /dev/null
+++ b/katsu/modules/gnome/gnome-chromebook-sc7180.yaml
@@ -0,0 +1,23 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-sc7180.yaml
+  - ../chromebook/live-cbe-sc7180.yaml
+  - gnome.yaml
+
+out_file: ultramarine-cbe-sc7c-gnome-40-live.iso
+
+#  scripts:
+#  post:
+#    - id: gnome-live
+#      name: Set up GNOME Live
+#      file: gnome-live.sh
+
+distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/gnome/gnome-chromebook-stoneyridge.yaml b/katsu/modules/gnome/gnome-chromebook-stoneyridge.yaml
new file mode 100644
index 00000000..03c366ea
--- /dev/null
+++ b/katsu/modules/gnome/gnome-chromebook-stoneyridge.yaml
@@ -0,0 +1,23 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-stoneyridge.yaml
+  - ../chromebook/live-cbe-stoneyridge.yaml
+  - gnome.yaml
+
+out_file: ultramarine-cbe-stoney-gnome-40-live.iso
+
+#  scripts:
+#  post:
+#    - id: gnome-live
+#      name: Set up GNOME Live
+#      file: gnome-live.sh
+
+distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/gnome/gnome-chromebook-x86-64.yaml b/katsu/modules/gnome/gnome-chromebook-x86-64.yaml
new file mode 100644
index 00000000..c909e85c
--- /dev/null
+++ b/katsu/modules/gnome/gnome-chromebook-x86-64.yaml
@@ -0,0 +1,23 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe.yaml
+  - ../chromebook/live-cbe.yaml
+  - gnome.yaml
+
+out_file: ultramarine-cbe-gnome-40-live.iso
+
+#  scripts:
+#  post:
+#    - id: gnome-live
+#      name: Set up GNOME Live
+#      file: gnome-live.sh
+
+distro: Ultramarine Linux 40 GNOME (Chromebook Edition)
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/gnome/gnome-initial-setup.sh b/katsu/modules/gnome/gnome-initial-setup.sh
new file mode 100644
index 00000000..9ec7e87b
--- /dev/null
+++ b/katsu/modules/gnome/gnome-initial-setup.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+
+# Edit /etc/gdm/custom.conf at [daemon], to enable initial-setup
+
+sed '/[daemon]/a InitialSetupEnable=True' /etc/gdm/custom.conf
+
+# Now get GDM to actually run it
+
+touch /var/lib/gdm/run-initial-setup
diff --git a/katsu/modules/gnome/gnome-live.yaml b/katsu/modules/gnome/gnome-live.yaml
index c7352ea6..7e88f734 100644
--- a/katsu/modules/gnome/gnome-live.yaml
+++ b/katsu/modules/gnome/gnome-live.yaml
@@ -3,17 +3,12 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
-
-out_file: ultramarine-gnome-40-live.iso
-
-scripts:
-  post:
-    - id: gnome-live
-      name: Set up GNOME Live
-      file: gnome-live.sh
+  - gnome.yaml
 
 distro: Ultramarine GNOME 40
 
+out_file: ultramarine-gnome-40-live.iso
+
 bootloader: grub
 
 kernel_cmdline: "quiet rhgb"
@@ -21,16 +16,18 @@ kernel_cmdline: "quiet rhgb"
 iso:
   volume_id: UM-Gn-Live
 
+scripts:
+  post:
+    - id: gnome-live
+      name: Set up GNOME Live
+      file: gnome-live.sh
+
 dnf:
+  options:
+    - --setopt='--tsflags=' # possibly fix #6 by blanking out the tsflags so docs are installed
+    - -d2 #debug
+    - --setopt=install_weak_deps=False
+    - --setopt=cachedir=/var/cache/dnf
+    - --setopt=keepcache=True
+    - --best
   releasever: 40
-  # options:
-  #   - --setopt=strict=0
-  packages:
-    - "@ultramarine-gnome-product-environment"
-    - ultramarine-release-gnome
-    - ultramarine-release-identity-gnome
-# scripts:
-#   post:
-#     - id: flagship-live
-#       name: Set up Flagship Live
-#       file: ./flagship-live.sh
diff --git a/katsu/modules/gnome/gnome.yaml b/katsu/modules/gnome/gnome.yaml
new file mode 100644
index 00000000..fd2f8f4d
--- /dev/null
+++ b/katsu/modules/gnome/gnome.yaml
@@ -0,0 +1,14 @@
+dnf:
+  releasever: 40
+  # options:
+  #   - --setopt=strict=0
+  packages:
+    - "@ultramarine-gnome-product-environment"
+    - ultramarine-release-gnome
+    - ultramarine-release-identity-gnome
+
+scripts:
+  post:
+    - id: gnome-initial-setup
+      name: Set GNOME Initial Setup to run
+      file: gnome-initial-setup.sh
\ No newline at end of file
diff --git a/katsu/modules/kde/base-disk-aarch64.yaml b/katsu/modules/kde/base-disk-aarch64.yaml
new file mode 100644
index 00000000..4ba88209
--- /dev/null
+++ b/katsu/modules/kde/base-disk-aarch64.yaml
@@ -0,0 +1,42 @@
+builder: dnf
+distro: Ultramarine Linux 40 (KDE Edition)
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+import:
+  - ../base/base.yaml
+  - ../base/base-disk.yaml
+  - kde.yaml
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 12GiB
+  partitions:
+    - label: EFI
+      size: 512MiB
+      filesystem: efi
+      mountpoint: /boot/efi
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 40
+  arch: aarch64
diff --git a/katsu/modules/kde/base-disk-x86_64.yaml b/katsu/modules/kde/base-disk-x86_64.yaml
new file mode 100644
index 00000000..2421b9b4
--- /dev/null
+++ b/katsu/modules/kde/base-disk-x86_64.yaml
@@ -0,0 +1,41 @@
+builder: dnf
+distro: Ultramarine Linux 40 (KDE Edition)
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+import:
+  - ../base/base.yaml
+  - ../base/base-disk.yaml
+  - kde.yaml
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 12GiB
+  partitions:
+    - label: EFI
+      size: 512MiB
+      filesystem: efi
+      mountpoint: /boot/efi
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook-kernel.yaml b/katsu/modules/kde/kde-chromebook-kernel.yaml
new file mode 100644
index 00000000..5cf13a19
--- /dev/null
+++ b/katsu/modules/kde/kde-chromebook-kernel.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-kernel.yaml
+  - ../chromebook/live-cbe-kernel.yaml
+  - kde.yaml
+
+distro: Ultramarine Linux 40 KDE (Chromebook Edition)
+
+out_file: ultramarine-cbe-kde-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook-mt8183.yaml b/katsu/modules/kde/kde-chromebook-mt8183.yaml
new file mode 100644
index 00000000..1e0408dd
--- /dev/null
+++ b/katsu/modules/kde/kde-chromebook-mt8183.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-mt8183.yaml
+  - ../chromebook/live-cbe-mt8183.yaml
+  - kde.yaml
+
+distro: Ultramarine Linux 40 KDE (Chromebook Edition)
+
+out_file: ultramarine-cbe-mt8183-kde-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook-mt8192.yaml b/katsu/modules/kde/kde-chromebook-mt8192.yaml
new file mode 100644
index 00000000..2a5a657c
--- /dev/null
+++ b/katsu/modules/kde/kde-chromebook-mt8192.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-mt8192.yaml
+  - ../chromebook/live-cbe-mt8192.yaml
+  - kde.yaml
+
+distro: Ultramarine Linux 40 KDE (Chromebook Edition)
+
+out_file: ultramarine-cbe-mt8192-kde-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook-sc7180.yaml b/katsu/modules/kde/kde-chromebook-sc7180.yaml
new file mode 100644
index 00000000..7c1f88bb
--- /dev/null
+++ b/katsu/modules/kde/kde-chromebook-sc7180.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-sc7180.yaml
+  - ../chromebook/live-cbe-sc7180.yaml
+  - kde.yaml
+
+distro: Ultramarine Linux 40 KDE (Chromebook Edition)
+
+out_file: ultramarine-cbe-sc7c-kde-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook-stoneyridge.yaml b/katsu/modules/kde/kde-chromebook-stoneyridge.yaml
new file mode 100644
index 00000000..4389907f
--- /dev/null
+++ b/katsu/modules/kde/kde-chromebook-stoneyridge.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-stoneyridge.yaml
+  - ../chromebook/live-cbe-stoneyridge.yaml
+  - kde.yaml
+
+distro: Ultramarine Linux 40 KDE (Chromebook Edition)
+
+out_file: ultramarine-cbe-stoney-kde-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook-x86-64.yaml b/katsu/modules/kde/kde-chromebook-x86-64.yaml
new file mode 100644
index 00000000..3b3ada7a
--- /dev/null
+++ b/katsu/modules/kde/kde-chromebook-x86-64.yaml
@@ -0,0 +1,17 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe.yaml
+  - ../chromebook/live-cbe.yaml
+  - kde.yaml
+
+distro: Ultramarine Linux 40 KDE (Chromebook Edition)
+
+out_file: ultramarine-cbe-kde-40.img
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/kde/kde-chromebook.yaml b/katsu/modules/kde/kde-chromebook.yaml
deleted file mode 100644
index ddc0adf3..00000000
--- a/katsu/modules/kde/kde-chromebook.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-builder: dnf
-
-import:
-  - ../chromebook/base-cbe.yaml
-  - ../chromebook/live-cbe.yaml
-
-distro: Ultramarine CBE KDE 40
-
-out_file: ultramarine-cbe-kde-40.img
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
-dnf:
-  releasever: 40
-  # options:
-  #   - --setopt=strict=0
-  packages:
-    - "@ultramarine-kde-product-environment"
-# scripts:
-#   post:
-#     - id: flagship-live
-#       name: Set up Flagship Live
-#       file: ./flagship-live.sh
diff --git a/katsu/modules/kde/kde-live.yaml b/katsu/modules/kde/kde-live.yaml
index 5e28cbb0..c79f080f 100644
--- a/katsu/modules/kde/kde-live.yaml
+++ b/katsu/modules/kde/kde-live.yaml
@@ -3,8 +3,9 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
+  - kde.yaml
 
-distro: Ultramarine KDE 40
+distro: Ultramarine Linux 40 (KDE Edition)
 
 out_file: ultramarine-kde-40-live.iso
 
@@ -23,12 +24,3 @@ iso:
 
 dnf:
   releasever: 40
-  # options:
-  #   - --setopt=strict=0
-  packages:
-    - "@ultramarine-kde-product-environment"
-# scripts:
-#   post:
-#     - id: flagship-live
-#       name: Set up Flagship Live
-#       file: ./flagship-live.sh
diff --git a/katsu/modules/kde/kde.yaml b/katsu/modules/kde/kde.yaml
new file mode 100644
index 00000000..973a1dc0
--- /dev/null
+++ b/katsu/modules/kde/kde.yaml
@@ -0,0 +1,10 @@
+dnf:
+  releasever: 40
+  # options:
+  #   - --setopt=strict=0
+  #exclude:
+  #-
+  packages:
+    #beta - still need to set up our own comps
+    - "@ultramarine-kde-product-environment"
+    - initial-setup-gui-wayland-plasma # Use KWin version of initial-setup
diff --git a/katsu/modules/live/live.sh b/katsu/modules/live/live.sh
index 01080549..2cdf603f 100644
--- a/katsu/modules/live/live.sh
+++ b/katsu/modules/live/live.sh
@@ -73,6 +73,12 @@ Comment=Welcome to Ultramarine
 Exec=bash -c "sudo glib-compile-schemas /usr/share/glib-2.0/schemas || : && /usr/share/anaconda/gnome/fedora-welcome"
 Terminal=false
 Type=Application
+
+# Remove the initial setup configs, we actually don't need them for now
+rm -rf /.unconfigured
+systemctl disable initial-setup || true
+
+
 EOA
 
 EOF
diff --git a/katsu/modules/live/live.yaml b/katsu/modules/live/live.yaml
index 5c297b49..00ae807f 100644
--- a/katsu/modules/live/live.yaml
+++ b/katsu/modules/live/live.yaml
@@ -13,14 +13,12 @@ dnf:
     - fedora-release*
     - generic-release*
     - fedora-bookmarks
-    - initial-setup
     - fcoe-utils
     - device-mapper-multipath
     - gnome-boxes
     - deepin-wallpapers
-    - initial-setup-gui
-    - initial-setup
   packages:
+    - initial-setup-gui # UM40 change, we are now enabling OOBEs for disk images firstboots and OEM installs!
     - python3-umstellar
     - glibc-all-langpacks
     - dracut-config-generic
diff --git a/katsu/modules/pantheon/base-disk-aarch64.yaml b/katsu/modules/pantheon/base-disk-aarch64.yaml
new file mode 100644
index 00000000..9b63ef8e
--- /dev/null
+++ b/katsu/modules/pantheon/base-disk-aarch64.yaml
@@ -0,0 +1,42 @@
+builder: dnf
+distro: Ultramarine Linux 40 (Pantheon Edition)
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+import:
+  - ../base/base.yaml
+  - ../base/base-disk.yaml
+  - pantheon.yaml
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 9GiB
+  partitions:
+    - label: EFI
+      size: 512MiB
+      filesystem: efi
+      mountpoint: /boot/efi
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 40
+  arch: aarch64
diff --git a/katsu/modules/pantheon/base-disk-x86_64.yaml b/katsu/modules/pantheon/base-disk-x86_64.yaml
new file mode 100644
index 00000000..357113c6
--- /dev/null
+++ b/katsu/modules/pantheon/base-disk-x86_64.yaml
@@ -0,0 +1,41 @@
+builder: dnf
+distro: Ultramarine Linux 40 (Pantheon Edition)
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+import:
+  - ../base/base.yaml
+  - ../base/base-disk.yaml
+  - pantheon.yaml
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 9GiB
+  partitions:
+    - label: EFI
+      size: 512MiB
+      filesystem: efi
+      mountpoint: /boot/efi
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/pantheon/pantheon-chromebook-kernel.yaml b/katsu/modules/pantheon/pantheon-chromebook-kernel.yaml
new file mode 100644
index 00000000..decad5ad
--- /dev/null
+++ b/katsu/modules/pantheon/pantheon-chromebook-kernel.yaml
@@ -0,0 +1,23 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-kernel.yaml
+  - ../chromebook/live-cbe-kernel.yaml
+  - pantheon.yaml
+
+out_file: ultramarine-cbe-pantheon-40-live.iso
+
+#  scripts:
+#  post:
+#    - id: pantheon-live
+#      name: Set up Pantheon Live
+#      file: ./pantheon-live.sh
+
+distro: Ultramarine Linux 40 Pantheon (Chromebook Edition)
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/pantheon/pantheon-chromebook-mt8183.yaml b/katsu/modules/pantheon/pantheon-chromebook-mt8183.yaml
new file mode 100644
index 00000000..562ce656
--- /dev/null
+++ b/katsu/modules/pantheon/pantheon-chromebook-mt8183.yaml
@@ -0,0 +1,23 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-mt8183.yaml
+  - ../chromebook/live-cbe-mt8183.yaml
+  - pantheon.yaml
+
+out_file: ultramarine-cbe-mt8183-pantheon-39-live.iso
+
+#  scripts:
+#  post:
+#    - id: pantheon-live
+#      name: Set up Pantheon Live
+#      file: ./pantheon-live.sh
+
+distro: Ultramarine Linux 40 Pantheon (Chromebook Edition)
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/pantheon/pantheon-chromebook-mt8192.yaml b/katsu/modules/pantheon/pantheon-chromebook-mt8192.yaml
new file mode 100644
index 00000000..ffcf156d
--- /dev/null
+++ b/katsu/modules/pantheon/pantheon-chromebook-mt8192.yaml
@@ -0,0 +1,23 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-mt8192.yaml
+  - ../chromebook/live-cbe-mt8192.yaml
+  - pantheon.yaml
+
+out_file: ultramarine-cbe-mt8192-pantheon-40-live.iso
+
+#  scripts:
+#  post:
+#    - id: pantheon-live
+#      name: Set up Pantheon Live
+#      file: ./pantheon-live.sh
+
+distro: Ultramarine Linux 40 Pantheon (Chromebook Edition)
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/pantheon/pantheon-chromebook-sc7180.yaml b/katsu/modules/pantheon/pantheon-chromebook-sc7180.yaml
new file mode 100644
index 00000000..34b89504
--- /dev/null
+++ b/katsu/modules/pantheon/pantheon-chromebook-sc7180.yaml
@@ -0,0 +1,23 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-sc7180.yaml
+  - ../chromebook/live-cbe-sc7180.yaml
+  - pantheon.yaml
+
+out_file: ultramarine-cbe-sc7c-pantheon-40-live.iso
+
+#  scripts:
+#  post:
+#    - id: pantheon-live
+#      name: Set up Pantheon Live
+#      file: ./pantheon-live.sh
+
+distro: Ultramarine Linux 40 Pantheon (Chromebook Edition)
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/pantheon/pantheon-chromebook-stoneyridge.yaml b/katsu/modules/pantheon/pantheon-chromebook-stoneyridge.yaml
new file mode 100644
index 00000000..cab604c9
--- /dev/null
+++ b/katsu/modules/pantheon/pantheon-chromebook-stoneyridge.yaml
@@ -0,0 +1,22 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe-stoneyridge.yaml
+  - ../chromebook/live-cbe-stoneyridge.yaml
+  - pantheon.yaml
+out_file: ultramarine-cbe-stoney-pantheon-40-live.iso
+
+#  scripts:
+#  post:
+#    - id: pantheon-live
+#      name: Set up Pantheon Live
+#      file: ./pantheon-live.sh
+
+distro: Ultramarine Linux 40 Pantheon (Chromebook Edition)
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/pantheon/pantheon-chromebook-x86_64.yaml b/katsu/modules/pantheon/pantheon-chromebook-x86_64.yaml
new file mode 100644
index 00000000..c2eab787
--- /dev/null
+++ b/katsu/modules/pantheon/pantheon-chromebook-x86_64.yaml
@@ -0,0 +1,20 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe.yaml
+  - ../chromebook/live-cbe.yaml
+  - pantheon.yaml
+
+out_file: ultramarine-cbe-pantheon-40-live.iso
+
+#  scripts:
+#  post:
+#    - id: pantheon-live
+#      name: Set up Pantheon Live
+#      file: ./pantheon-live.sh
+
+distro: Ultramarine Linux 40 Pantheon (Chromebook Edition)
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
diff --git a/katsu/modules/pantheon/pantheon-live.yaml b/katsu/modules/pantheon/pantheon-live.yaml
index 89cc7dc2..e48e283a 100644
--- a/katsu/modules/pantheon/pantheon-live.yaml
+++ b/katsu/modules/pantheon/pantheon-live.yaml
@@ -3,7 +3,7 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
-
+  - pantheon.yaml
 out_file: ultramarine-pantheon-40-live.iso
 
 scripts:
@@ -12,7 +12,7 @@ scripts:
       name: Set up Pantheon Live
       file: ./pantheon-live.sh
 
-distro: Ultramarine Pantheon 40
+distro: Ultramarine Linux 40 (Pantheon Edition)
 
 bootloader: grub
 
@@ -23,36 +23,3 @@ iso:
 
 dnf:
   releasever: 40
-  options:
-    - --setopt=strict=1
-  exclude:
-    - gnome-tour
-    - gnome-shell
-    - setroubleshoot
-  arch_exclude:
-    x86_64:
-      - elementary-calculator
-      - elementary-calendar
-      - elementary-capnet-assist
-      - elementary-camera
-      - elementary-mail
-      - elementary-music
-      - elementary-videos
-      - evince # yes, this application is shipped in appcenter
-  packages:
-    - "@ultramarine-pantheon-product-environment"
-    - elementary-greeter
-    - lightdm
-    - seahorse
-    - appcenter
-    - xdg-user-dirs-gtk
-    - xdg-desktop-portal-gtk
-    - xdg-desktop-portal-xapp
-    - ultramarine-backgrounds-gnome
-    - rsms-inter-fonts
-    - ultramarine-repos-appcenter
-# scripts:
-#   post:
-#     - id: flagship-live
-#       name: Set up Flagship Live
-#       file: ./flagship-live.sh
diff --git a/katsu/modules/pantheon/pantheon-chromebook.yaml b/katsu/modules/pantheon/pantheon.yaml
similarity index 59%
rename from katsu/modules/pantheon/pantheon-chromebook.yaml
rename to katsu/modules/pantheon/pantheon.yaml
index 5205db4b..591bc858 100644
--- a/katsu/modules/pantheon/pantheon-chromebook.yaml
+++ b/katsu/modules/pantheon/pantheon.yaml
@@ -1,23 +1,5 @@
 builder: dnf
 
-import:
-  - ../chromebook/base-cbe.yaml
-  - ../chromebook/live-cbe.yaml
-
-out_file: ultramarine-cbe-pantheon-40-live.iso
-
-#  scripts:
-#  post:
-#    - id: pantheon-live
-#      name: Set up Pantheon Live
-#      file: ./pantheon-live.sh
-
-distro: Ultramarine CBE Pantheon 40
-
-bootloader: grub
-
-kernel_cmdline: "quiet rhgb"
-
 dnf:
   releasever: 40
   options:
@@ -38,18 +20,13 @@ dnf:
       - evince # yes, this application is shipped in appcenter
   packages:
     - "@ultramarine-pantheon-product-environment"
-    - elementary-greeter
+    # - elementary-greeter
     - lightdm
     - seahorse
-    - appcenter
+    # - appcenter
     - xdg-user-dirs-gtk
     - xdg-desktop-portal-gtk
     - xdg-desktop-portal-xapp
     - ultramarine-backgrounds-gnome
     - rsms-inter-fonts
     - ultramarine-repos-appcenter
-# scripts:
-#   post:
-#     - id: flagship-live
-#       name: Set up Flagship Live
-#       file: ./flagship-live.sh
diff --git a/katsu/modules/xfce/base-disk-aarch64.yaml b/katsu/modules/xfce/base-disk-aarch64.yaml
new file mode 100644
index 00000000..9f25cc73
--- /dev/null
+++ b/katsu/modules/xfce/base-disk-aarch64.yaml
@@ -0,0 +1,42 @@
+builder: dnf
+distro: Ultramarine Linux 40 (Xfce Edition)
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+import:
+  - ../base/base.yaml
+  - ../base/base-disk.yaml
+  - xfce.yaml
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 10GiB
+  partitions:
+    - label: EFI
+      size: 512MiB
+      filesystem: efi
+      mountpoint: /boot/efi
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 40
+  arch: aarch64
diff --git a/katsu/modules/xfce/base-disk-x86_64.yaml b/katsu/modules/xfce/base-disk-x86_64.yaml
new file mode 100644
index 00000000..056bee21
--- /dev/null
+++ b/katsu/modules/xfce/base-disk-x86_64.yaml
@@ -0,0 +1,41 @@
+builder: dnf
+distro: Ultramarine Linux 40 (Xfce Edition)
+
+users:
+  - username: ultramarine
+    # plaintext password: ultramarine
+    password: "$y$j9T$6/DebcxXazPrtBYnNXtEM.$yaUJHww5Mo1L8xNJ9IDJ.bvKOrIJxAG9PGQKWioBMx3"
+    groups:
+      - wheel
+
+import:
+  - ../base/base.yaml
+  - ../base/base-disk.yaml
+  - xfce.yaml
+
+scripts:
+  post:
+    - id: grub
+      name: Set up GRUB
+      file: ../base/grub-setup.sh
+
+disk:
+  size: 10GiB
+  partitions:
+    - label: EFI
+      size: 512MiB
+      filesystem: efi
+      mountpoint: /boot/efi
+
+    - label: boot
+      size: 1GiB
+      filesystem: ext4
+      mountpoint: /boot
+
+    - label: root
+      # size: 2.5MiB
+      filesystem: ext4
+      mountpoint: /
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/xfce/xfce-chromebook-x86-64.yaml b/katsu/modules/xfce/xfce-chromebook-x86-64.yaml
new file mode 100644
index 00000000..3faa96ea
--- /dev/null
+++ b/katsu/modules/xfce/xfce-chromebook-x86-64.yaml
@@ -0,0 +1,20 @@
+builder: dnf
+
+import:
+  - ../chromebook/base-cbe.yaml
+  - ../chromebook/live-cbe.yaml
+  - xfce.yaml
+
+out_file: ultramarine-cbe-xfce-40-live.iso
+
+#  scripts:
+#  post:
+#    - id: pantheon-live
+#      name: Set up Pantheon Live
+#      file: ./pantheon-live.sh
+
+distro: Ultramarine Linux 40 Xfce (Chromebook Edition)
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
diff --git a/katsu/modules/xfce/xfce-live.sh b/katsu/modules/xfce/xfce-live.sh
new file mode 100644
index 00000000..e740e840
--- /dev/null
+++ b/katsu/modules/xfce/xfce-live.sh
@@ -0,0 +1,46 @@
+#!/bin/bash -x
+
+# set livesys session type
+#sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys
+
+glib-compile-schemas /usr/share/glib-2.0/schemas/
+
+cat >> /var/lib/livesys/livesys-session-extra << EOF
+## set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+# set Xfce as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf
+
+# Update installer icon
+sed -i -e 's/Icon=org.fedoraproject.AnacondaInstaller/Icon=drive-harddisk/' /usr/share/applications/liveinst.desktop
+
+# Show harddisk install on the desktop
+sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
+
+# and mark it as executable
+chmod +x /home/liveuser/Desktop/liveinst.desktop
+
+# Install welcome screen
+sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/fedora-welcome
+sed -i 's/fedora-logo-icon/ultramarine/g' /usr/share/anaconda/gnome/fedora-welcome
+
+# allow anaconda to use system icon theme
+sed -i -e 's/settings.set_property("gtk-icon-theme-name", "Adwaita")//' /usr/lib64/python3.12/site-packages/pyanaconda/ui/gui/__init__.py
+
+glib-compile-schemas /usr/share/glib-2.0/schemas/
+
+# this goes at the end after all other changes.
+chown -R liveuser:liveuser /home/liveuser
+restorecon -R /home/liveuser
+EOF
+
+cp /etc/lightdm/lightdm.conf.d/50-ultramarine-lightdm-gtk-greeter.conf /etc/lightdm/lightdm-gtk-greeter.conf
+
+# Reinstall anaconda-core and anaconda-live to make sure we fix any localization issues
+
+# dnf reinstall -y anaconda-core
+
+dnf clean all
diff --git a/katsu/modules/xfce/xfce-live.yaml b/katsu/modules/xfce/xfce-live.yaml
new file mode 100644
index 00000000..173dea7c
--- /dev/null
+++ b/katsu/modules/xfce/xfce-live.yaml
@@ -0,0 +1,26 @@
+builder: dnf
+
+import:
+  - ../base/base.yaml
+  - ../live/live.yaml
+  - xfce.yaml
+
+distro: Ultramarine Linux 40 (Xfce Edition)
+
+out_file: ultramarine-xfce-40-live.iso
+
+bootloader: grub
+
+kernel_cmdline: "quiet rhgb"
+
+iso:
+  volume_id: UM-Xfce-Live
+
+scripts:
+  post:
+    - id: xfce-live
+      name: Set up XFCE Live
+      file: ./xfce-live.sh
+
+dnf:
+  releasever: 40
diff --git a/katsu/modules/xfce/xfce.yaml b/katsu/modules/xfce/xfce.yaml
new file mode 100644
index 00000000..3a3f15a9
--- /dev/null
+++ b/katsu/modules/xfce/xfce.yaml
@@ -0,0 +1,9 @@
+dnf:
+  releasever: 40
+  # options:
+  #   - --setopt=strict=0
+  #exclude:
+  #-
+  packages:
+    #beta - still need to set up our own comps
+    - "@xfce-desktop"