diff --git a/oem/bladebook-oem-cinnamon/live-overlay/etc b/oem/bladebook-oem-cinnamon/live-overlay/etc
index 227dce0..b92ae20 120000
--- a/oem/bladebook-oem-cinnamon/live-overlay/etc
+++ b/oem/bladebook-oem-cinnamon/live-overlay/etc
@@ -1 +1 @@
-../../../shared/manjaro/live-overlay/etc/
\ No newline at end of file
+../../../shared/oem/live-overlay/etc
\ No newline at end of file
diff --git a/oem/bladebook-oem-cinnamon/live-overlay/usr b/oem/bladebook-oem-cinnamon/live-overlay/usr
index b56c83d..8aca2d5 120000
--- a/oem/bladebook-oem-cinnamon/live-overlay/usr
+++ b/oem/bladebook-oem-cinnamon/live-overlay/usr
@@ -1 +1 @@
-../../../shared/manjaro/live-overlay/usr
\ No newline at end of file
+../../../shared/oem/live-overlay/usr
\ No newline at end of file
diff --git a/oem/bladebook-oem-gnome/live-overlay/usr/share b/oem/bladebook-oem-gnome/live-overlay/usr/share
index 6adfc9d..7b62103 120000
--- a/oem/bladebook-oem-gnome/live-overlay/usr/share
+++ b/oem/bladebook-oem-gnome/live-overlay/usr/share
@@ -1 +1 @@
-../../../../shared/manjaro/live-overlay/usr/share
\ No newline at end of file
+../../../../shared/oem/live-overlay/usr/share
\ No newline at end of file
diff --git a/oem/bladebook-oem-i3/live-overlay/usr/share b/oem/bladebook-oem-i3/live-overlay/usr/share
new file mode 120000
index 0000000..7b62103
--- /dev/null
+++ b/oem/bladebook-oem-i3/live-overlay/usr/share
@@ -0,0 +1 @@
+../../../../shared/oem/live-overlay/usr/share
\ No newline at end of file
diff --git a/oem/bladebook-oem-i3/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/oem/bladebook-oem-i3/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
deleted file mode 100644
index 099b90d..0000000
--- a/oem/bladebook-oem-i3/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
+++ /dev/null
@@ -1,24 +0,0 @@
----
-componentName:  manjaro
-
-strings:
-    productName:         Manjaro Linux
-    shortProductName:    Manjaro
-    version:             18.0 OEM
-    shortVersion:        18.0 OEM
-    versionedName:       Manjaro Linux 18.0 OEM "Illyria"
-    shortVersionedName:  Manjaro 18.0 OEM
-    bootloaderEntryName: Manjaro
-
-images:
-    productLogo:         "logo.png"
-    productIcon:         "logo.png"
-    productWelcome:      "languages.png"
-
-slideshow:               "show.qml"
-
-style:
-   sidebarBackground:    "#454948"
-   sidebarText:          "#efefef"
-   sidebarTextSelect:    "#9E4F5D"
-
diff --git a/oem/bladebook-oem-kde/live-overlay/usr b/oem/bladebook-oem-kde/live-overlay/usr
new file mode 120000
index 0000000..8aca2d5
--- /dev/null
+++ b/oem/bladebook-oem-kde/live-overlay/usr
@@ -0,0 +1 @@
+../../../shared/oem/live-overlay/usr
\ No newline at end of file
diff --git a/oem/bladebook-oem-xfce/live-overlay/usr b/oem/bladebook-oem-xfce/live-overlay/usr
new file mode 120000
index 0000000..8aca2d5
--- /dev/null
+++ b/oem/bladebook-oem-xfce/live-overlay/usr
@@ -0,0 +1 @@
+../../../shared/oem/live-overlay/usr
\ No newline at end of file
diff --git a/oem/bladebook-oem-xfce/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/oem/bladebook-oem-xfce/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
deleted file mode 100644
index 31dc04a..0000000
--- a/oem/bladebook-oem-xfce/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
+++ /dev/null
@@ -1,23 +0,0 @@
----
-componentName:  manjaro
-
-strings:
-    productName:         Manjaro Linux
-    shortProductName:    Manjaro
-    version:             18.0 OEM
-    shortVersion:        18.0 OEM
-    versionedName:       Manjaro Linux 18.0 OEM "Illyria"
-    shortVersionedName:  Manjaro 18.0 OEM
-    bootloaderEntryName: Manjaro
-
-images:
-    productLogo:         "logo.png"
-    productIcon:         "logo.png"
-    productWelcome:      "languages.png"
-
-slideshow:               "show.qml"
-
-style:
-   sidebarBackground:    "#454948"
-   sidebarText:          "#efefef"
-   sidebarTextSelect:    "#9E4F5D"
diff --git a/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
index d674a2e..8bb438a 100644
--- a/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
+++ b/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
@@ -4,10 +4,10 @@ componentName:  manjaro
 strings:
     productName:         Manjaro Linux
     shortProductName:    Manjaro
-    version:             18.0.3
-    shortVersion:        18.0.3
-    versionedName:       Manjaro Linux 18.0.3 "Illyria"
-    shortVersionedName:  Manjaro 18.0.3
+    version:             18.0.4
+    shortVersion:        18.0.4
+    versionedName:       Manjaro Linux 18.0.4 "Illyria"
+    shortVersionedName:  Manjaro 18.0.4
     bootloaderEntryName: Manjaro
 
 images:
diff --git a/shared/oem/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/shared/oem/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
index d674a2e..98cef27 100644
--- a/shared/oem/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
+++ b/shared/oem/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
@@ -4,10 +4,10 @@ componentName:  manjaro
 strings:
     productName:         Manjaro Linux
     shortProductName:    Manjaro
-    version:             18.0.3
-    shortVersion:        18.0.3
-    versionedName:       Manjaro Linux 18.0.3 "Illyria"
-    shortVersionedName:  Manjaro 18.0.3
+    version:             18 OEM
+    shortVersion:        18 OEM
+    versionedName:       Manjaro Linux 18 "Illyria" OEM
+    shortVersionedName:  Manjaro 18 OEM
     bootloaderEntryName: Manjaro
 
 images: