diff --git a/.gitmodules b/.gitmodules
index c9ba367..04415a5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "assets"]
-	path = subprojects/assets
-	url = https://github.com/apollo-linux/assets
 [submodule "subprojects/arch-bootc-pkgs"]
 	path = subprojects/arch-bootc-pkgs
 	url = https://github.com/hecknt/arch-bootc-pkgs
diff --git a/mkosi.conf.d/subprojects.conf b/mkosi.conf.d/subprojects.conf
index 0562141..75a4f20 100644
--- a/mkosi.conf.d/subprojects.conf
+++ b/mkosi.conf.d/subprojects.conf
@@ -2,7 +2,6 @@
 Distribution=arch
 
 [Content]
-ExtraTrees=subprojects/assets/system_files/:/
 Packages=
 		homebrew
 		brew-proxy
diff --git a/mkosi.extra/usr/share/apollo/assets/watermark.svg b/mkosi.extra/usr/share/apollo/assets/watermark.svg
new file mode 100644
index 0000000..c0dd4fc
--- /dev/null
+++ b/mkosi.extra/usr/share/apollo/assets/watermark.svg
@@ -0,0 +1,11 @@
+<svg width="204" height="56" viewBox="0 0 204 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M26.5719 53.2541C11.8966 53.2541 0 41.3327 0 26.627C1.35619e-05 12.0649 11.6654 0.23307 26.1427 0.00331906C26.4259 -0.00117562 26.7091 0.0446031 26.9785 0.132337C29.4646 0.942004 29.4646 4.46647 26.9785 5.27612C26.7091 5.36385 26.4261 5.40711 26.1429 5.41298C14.8759 5.64643 5.81262 15.0549 5.8126 26.627C5.8126 38.3456 15.1069 47.8454 26.5719 47.8454C37.8807 47.8454 47.0775 38.6028 47.326 27.1048C47.3329 26.7895 47.3825 26.4745 47.483 26.1756C48.3588 23.5703 52.0318 23.5584 52.9682 26.1425C53.0839 26.4617 53.1454 26.8026 53.1389 27.1423C52.8649 41.6102 41.0754 53.2541 26.5719 53.2541Z" fill="white"/>
+<path d="M16.3886 31.4004C16.3886 31.4004 17.662 26.9906 20.3079 27.4728C20.9898 27.5971 21.6988 27.9048 22.3759 28.3372C21.666 28.765 21.2626 29.936 21.2595 29.9449L20.7513 32.2051C20.6842 32.5032 20.9501 32.7696 21.2476 32.7024L23.5031 32.1931C23.5107 32.1905 24.6801 31.786 25.1073 31.0742C25.5389 31.7529 25.8462 32.4634 25.9703 33.1469C26.3048 34.9896 24.2813 36.1682 23.0157 36.7156C22.3892 36.9866 21.703 37.0582 21.0213 37.0262C19.3244 36.9467 17.6307 37.2397 16.0585 37.8845L15.6298 38.0604C15.4635 38.1286 15.2871 37.9873 15.3168 37.8098L16.3886 31.4004Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.0799 0.024979C51.4136 -0.246867 53.3896 1.7391 53.1191 4.08449C52.6252 8.36545 49.8028 11.3523 46.9671 14.585L36.2027 26.8568L38.2012 33.4719L33.8958 38.3804L29.0667 33.6369L28.9286 29.7474L23.3522 24.1653H19.7398L14.9467 19.3546L19.8304 15.0265L26.4247 17.1274L38.635 6.20475C41.8516 3.3548 44.8204 0.521324 49.0799 0.024979ZM42.2452 8.00892C40.5254 8.00892 39.1313 9.40595 39.1313 11.1293C39.1313 12.8526 40.5254 14.2496 42.2452 14.2496C43.9649 14.2496 45.359 12.8526 45.3591 11.1293C45.3591 9.40595 43.9649 8.00892 42.2452 8.00892Z" fill="white"/>
+<path d="M74.3735 45.9882C71.2557 45.9882 68.8289 45.2959 67.0928 43.9113C65.3568 42.4912 64.4888 40.4675 64.4888 37.8403C64.4888 35.0356 65.3922 32.941 67.1991 31.5563C69.006 30.1717 71.5392 29.4794 74.7987 29.4794H81.2822C81.1051 28.0948 80.6799 27.012 80.0068 26.2309C79.369 25.4144 78.3239 25.0061 76.8713 25.0061C75.8793 25.0061 75.0112 25.2369 74.2672 25.6984C73.5232 26.1599 72.8855 26.7812 72.3541 27.5623L65.0734 25.1659C65.7111 23.8522 66.5437 22.6629 67.5711 21.5978C68.634 20.5327 69.9272 19.6807 71.4506 19.0416C72.9741 18.4026 74.7455 18.083 76.765 18.083C79.5285 18.083 81.8668 18.5978 83.78 19.6274C85.6932 20.657 87.128 22.0949 88.0846 23.941C89.0412 25.7871 89.5195 27.9706 89.5195 30.4913L89.4132 45.3492H81.6542L81.5479 42.6332C80.8039 43.7338 79.8296 44.5681 78.625 45.1362C77.4204 45.7042 76.0033 45.9882 74.3735 45.9882ZM76.2336 39.7042C77.261 39.7042 78.1467 39.4912 78.8907 39.0652C79.6702 38.6391 80.2725 38.0711 80.6976 37.361C81.1582 36.6155 81.3885 35.8167 81.3885 34.9646V34.8581H77.881C76.145 34.8581 74.8872 35.1066 74.1078 35.6037C73.3284 36.0652 72.9386 36.7398 72.9386 37.6273C72.9386 38.2664 73.2221 38.7812 73.7889 39.1717C74.3912 39.5267 75.2061 39.7042 76.2336 39.7042Z" fill="white"/>
+<path d="M92.1788 56V18.7221H99.9909L100.31 22.1304C101.16 20.8168 102.223 19.8227 103.498 19.1481C104.809 18.4381 106.315 18.083 108.016 18.083C110.496 18.083 112.639 18.6511 114.446 19.7872C116.253 20.8878 117.635 22.4854 118.591 24.5801C119.548 26.6392 120.026 29.1244 120.026 32.0356C120.026 34.9114 119.548 37.3966 118.591 39.4912C117.635 41.5859 116.253 43.2013 114.446 44.3373C112.639 45.4379 110.496 45.9882 108.016 45.9882C106.35 45.9882 104.88 45.6687 103.605 45.0296C102.365 44.3551 101.32 43.3965 100.469 42.1539V56H92.1788ZM105.89 38.3196C106.953 38.3196 107.892 38.0534 108.706 37.5208C109.521 36.9883 110.177 36.2605 110.673 35.3374C111.169 34.3788 111.417 33.2782 111.417 32.0356C111.417 30.793 111.187 29.7102 110.726 28.7871C110.265 27.8286 109.61 27.083 108.76 26.5505C107.945 26.0179 107.006 25.7516 105.943 25.7516C104.88 25.7516 103.924 26.0179 103.073 26.5505C102.258 27.083 101.621 27.8286 101.16 28.7871C100.7 29.7457 100.469 30.8285 100.469 32.0356C100.469 33.2782 100.7 34.3788 101.16 35.3374C101.621 36.2605 102.258 36.9883 103.073 37.5208C103.888 38.0534 104.827 38.3196 105.89 38.3196Z" fill="white"/>
+<path d="M136.419 45.9882C133.62 45.9882 131.158 45.4024 129.032 44.2308C126.907 43.0237 125.224 41.3729 123.984 39.2782C122.779 37.1835 122.177 34.7693 122.177 32.0356C122.177 29.3019 122.761 26.8877 123.931 24.7931C125.135 22.6984 126.8 21.0653 128.926 19.8937C131.087 18.6866 133.532 18.083 136.26 18.083C139.059 18.083 141.521 18.6866 143.647 19.8937C145.808 21.0653 147.473 22.6984 148.642 24.7931C149.847 26.8877 150.449 29.3019 150.449 32.0356C150.449 34.7693 149.847 37.1835 148.642 39.2782C147.473 41.3729 145.826 43.0237 143.7 44.2308C141.574 45.4024 139.147 45.9882 136.419 45.9882ZM136.419 38.3196C137.482 38.3196 138.421 38.0534 139.236 37.5208C140.086 36.9883 140.742 36.2605 141.202 35.3374C141.698 34.3788 141.946 33.2782 141.946 32.0356C141.946 30.793 141.698 29.7102 141.202 28.7871C140.742 27.8286 140.086 27.083 139.236 26.5505C138.386 26.0179 137.411 25.7516 136.313 25.7516C135.215 25.7516 134.24 26.0179 133.39 26.5505C132.54 27.083 131.867 27.8286 131.371 28.7871C130.91 29.7102 130.68 30.793 130.68 32.0356C130.68 33.2782 130.91 34.3788 131.371 35.3374C131.867 36.2605 132.54 36.9883 133.39 37.5208C134.276 38.0534 135.286 38.3196 136.419 38.3196Z" fill="white"/>
+<path d="M152.896 45.3492V8.07127H161.186V45.3492H152.896Z" fill="white"/>
+<path d="M165.002 45.3492V8.07127H173.293V45.3492H165.002Z" fill="white"/>
+<path d="M189.97 45.9882C187.171 45.9882 184.709 45.4024 182.583 44.2308C180.457 43.0237 178.774 41.3729 177.534 39.2782C176.33 37.1835 175.727 34.7693 175.727 32.0356C175.727 29.3019 176.312 26.8877 177.481 24.7931C178.686 22.6984 180.351 21.0653 182.477 19.8937C184.638 18.6866 187.083 18.083 189.811 18.083C192.61 18.083 195.072 18.6866 197.198 19.8937C199.359 21.0653 201.024 22.6984 202.193 24.7931C203.398 26.8877 204 29.3019 204 32.0356C204 34.7693 203.398 37.1835 202.193 39.2782C201.024 41.3729 199.376 43.0237 197.251 44.2308C195.125 45.4024 192.698 45.9882 189.97 45.9882ZM189.97 38.3196C191.033 38.3196 191.972 38.0534 192.787 37.5208C193.637 36.9883 194.292 36.2605 194.753 35.3374C195.249 34.3788 195.497 33.2782 195.497 32.0356C195.497 30.793 195.249 29.7102 194.753 28.7871C194.292 27.8286 193.637 27.083 192.787 26.5505C191.936 26.0179 190.962 25.7516 189.864 25.7516C188.765 25.7516 187.791 26.0179 186.941 26.5505C186.091 27.083 185.417 27.8286 184.921 28.7871C184.461 29.7102 184.23 30.793 184.23 32.0356C184.23 33.2782 184.461 34.3788 184.921 35.3374C185.417 36.2605 186.091 36.9883 186.941 37.5208C187.827 38.0534 188.836 38.3196 189.97 38.3196Z" fill="white"/>
+</svg>
diff --git a/mkosi.extra/usr/share/pixmaps/apollo-logo-dark.svg b/mkosi.extra/usr/share/pixmaps/apollo-logo-dark.svg
new file mode 100644
index 0000000..5d8c78e
--- /dev/null
+++ b/mkosi.extra/usr/share/pixmaps/apollo-logo-dark.svg
@@ -0,0 +1,5 @@
+<svg width="513" height="512" viewBox="0 0 513 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M256 512C114.615 512 0 397.385 0 256C0.000130659 115.996 112.387 2.24137 251.865 0.0324797C254.593 -0.0107334 257.322 0.429396 259.917 1.27289C283.869 9.05725 283.869 42.9424 259.917 50.7267C257.322 51.5701 254.595 51.986 251.867 52.0424C143.318 54.2869 56.0001 144.742 56 256C56 368.666 145.543 460 256 460C364.952 460 453.556 371.138 455.95 260.594C456.016 257.562 456.494 254.534 457.462 251.66C465.9 226.612 501.287 226.498 510.308 251.341C511.423 254.411 512.015 257.689 511.953 260.954C509.313 400.052 395.73 512 256 512Z" fill="white"/>
+<path d="M157.891 301.892C157.901 301.86 170.17 259.496 195.652 264.131C202.222 265.327 209.052 268.286 215.576 272.443C208.726 276.563 204.837 287.846 204.819 287.899L199.226 312.716C198.904 314.149 200.185 315.43 201.618 315.107L226.434 309.514C226.465 309.504 237.767 305.613 241.89 298.755C246.049 305.281 249.009 312.113 250.205 318.684C253.427 336.401 233.93 347.731 221.738 352.994C215.701 355.599 209.093 356.288 202.525 355.981C186.176 355.216 169.858 358.033 154.712 364.233L150.234 366.066C148.784 366.66 147.245 365.43 147.504 363.884L157.891 301.892Z" fill="white"/>
+<path d="M472.847 0.240479C495.33 -2.37374 514.367 16.7202 511.761 39.2698C507.003 80.4283 479.811 109.144 452.491 140.225L348.786 258.209L368.04 321.81L326.56 369L280.035 323.395L278.705 286L224.98 232.332H190.178L144 186.08L191.05 144.47L254.582 164.668L372.219 59.6555C403.208 32.2552 431.81 5.01249 472.847 0.240479ZM407 77.0002C390.431 77.0002 377 90.4317 377 107C377 123.569 390.432 137 407 137C423.568 137 437 123.569 437 107C437 90.4317 423.569 77.0002 407 77.0002Z" fill="white"/>
+</svg>
diff --git a/mkosi.extra/usr/share/pixmaps/apollo-logo.svg b/mkosi.extra/usr/share/pixmaps/apollo-logo.svg
new file mode 100644
index 0000000..1fd1ee2
--- /dev/null
+++ b/mkosi.extra/usr/share/pixmaps/apollo-logo.svg
@@ -0,0 +1,5 @@
+<svg width="513" height="512" viewBox="0 0 513 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M256 512C114.615 512 0 397.385 0 256C0.000130659 115.996 112.387 2.24137 251.865 0.0324797C254.593 -0.0107334 257.322 0.429396 259.917 1.27289C283.869 9.05725 283.869 42.9424 259.917 50.7267C257.322 51.5701 254.595 51.986 251.867 52.0424C143.318 54.2869 56.0001 144.742 56 256C56 368.666 145.543 460 256 460C364.952 460 453.556 371.138 455.95 260.594C456.016 257.562 456.494 254.534 457.462 251.66C465.9 226.612 501.287 226.498 510.308 251.341C511.423 254.411 512.015 257.689 511.953 260.954C509.313 400.052 395.73 512 256 512Z" fill="#8F05E0"/>
+<path d="M157.891 301.892C157.9 301.86 170.17 259.496 195.652 264.131C202.222 265.327 209.052 268.286 215.576 272.443C208.726 276.563 204.837 287.846 204.819 287.899L199.226 312.716C198.904 314.149 200.185 315.43 201.618 315.107L226.434 309.514C226.465 309.504 237.767 305.613 241.89 298.755C246.049 305.281 249.009 312.113 250.205 318.684C253.427 336.401 233.93 347.731 221.738 352.994C215.701 355.599 209.093 356.288 202.525 355.981C186.176 355.216 169.858 358.033 154.712 364.233L150.234 366.066C148.784 366.66 147.245 365.43 147.504 363.884L157.891 301.892Z" fill="#8F05E0"/>
+<path d="M472.847 0.240479C495.33 -2.37374 514.367 16.7202 511.761 39.2698C507.003 80.4283 479.811 109.144 452.491 140.225L348.786 258.209L368.04 321.81L326.56 369L280.035 323.395L278.705 286L224.98 232.332H190.178L144 186.08L191.05 144.47L254.582 164.668L372.219 59.6555C403.208 32.2552 431.81 5.01249 472.847 0.240479ZM407 77.0002C390.431 77.0002 377 90.4317 377 107C377 123.569 390.432 137 407 137C423.568 137 437 123.569 437 107C437 90.4317 423.569 77.0002 407 77.0002Z" fill="#8F05E0"/>
+</svg>
diff --git a/mkosi.extra/usr/share/plymouth/themes/spinner/watermark.png b/mkosi.extra/usr/share/plymouth/themes/spinner/watermark.png
new file mode 100644
index 0000000..e7ce1e3
Binary files /dev/null and b/mkosi.extra/usr/share/plymouth/themes/spinner/watermark.png differ
diff --git a/subprojects/assets b/subprojects/assets
deleted file mode 160000
index 72a68e6..0000000
--- a/subprojects/assets
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 72a68e6051c5db15ce14d07d66d6682a5f099074