diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index b55ff13..9cd06e8 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -147,7 +147,8 @@ xorg-xinit
 >extra xf86-input-wacom #support for tablet and pen display ( wacom ecc. )
 yelp
 
-ms-office-online
+#ms-office-online
+freeoffice
 
 #extra depends for file-roller
 >extra gnome-getting-started-docs
@@ -156,7 +157,7 @@ ms-office-online
 >extra unace
 >extra lrzip
 >extra gtk3-print-backends
->extra libreoffice-still
+#>extra libreoffice-still
 >extra evolution
 >extra lollypop
 >extra empathy
diff --git a/manjaro/gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig b/manjaro/gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig
index c1615a1..41beaf1 100644
--- a/manjaro/gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig
+++ b/manjaro/gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig
@@ -1,2 +1,2 @@
 [General]
-theme=KvArcMaia
+theme=Matcha
diff --git a/manjaro/gnome/live-overlay/usr/share b/manjaro/gnome/live-overlay/usr/share
deleted file mode 120000
index 6adfc9d..0000000
--- a/manjaro/gnome/live-overlay/usr/share
+++ /dev/null
@@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/usr/share
\ No newline at end of file
diff --git a/manjaro/kde-dev/live-overlay/usr b/manjaro/kde-dev/live-overlay/usr
deleted file mode 120000
index b56c83d..0000000
--- a/manjaro/kde-dev/live-overlay/usr
+++ /dev/null
@@ -1 +0,0 @@
-../../../shared/manjaro/live-overlay/usr
\ No newline at end of file
diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop
index 92fdcaa..3c0cde1 100644
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@@ -259,9 +259,10 @@ inxi
 #>extra krita
 >extra firefox
 >basic falkon
-ms-office-online
+#ms-office-online
+freeoffice
 #>extra libreoffice-fresh
->extra calligra
+#>extra calligra
 manjaro-hello
 manjaro-settings-manager-kcm
 manjaro-settings-manager-knotifier
diff --git a/manjaro/kde/live-overlay/usr b/manjaro/kde/live-overlay/usr
deleted file mode 120000
index b56c83d..0000000
--- a/manjaro/kde/live-overlay/usr
+++ /dev/null
@@ -1 +0,0 @@
-../../../shared/manjaro/live-overlay/usr
\ No newline at end of file
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index fde369e..81a8266 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -209,8 +209,9 @@ gufw
 htop
 qpdfview
 inxi
->extra libreoffice-still
-ms-office-online
+#>extra libreoffice-still
+#ms-office-online
+freeoffice
 manjaro-hello
 manjaro-application-utility
 manjaro-settings-manager
@@ -276,3 +277,6 @@ xdg-su
 ## Misc
 gtkhash-thunar
 manjaro-hotfixes
+
+## Workarounds
+boost-libs # needed to fix systemd-journal on live-boot
diff --git a/manjaro/xfce/live-overlay/usr b/manjaro/xfce/live-overlay/usr
deleted file mode 120000
index b56c83d..0000000
--- a/manjaro/xfce/live-overlay/usr
+++ /dev/null
@@ -1 +0,0 @@
-../../../shared/manjaro/live-overlay/usr
\ No newline at end of file
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
deleted file mode 100644
index 8bb438a..0000000
--- a/shared/manjaro/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.4
-    shortVersion:        18.0.4
-    versionedName:       Manjaro Linux 18.0.4 "Illyria"
-    shortVersionedName:  Manjaro 18.0.4
-    bootloaderEntryName: Manjaro
-
-images:
-    productLogo:         "logo.png"
-    productIcon:         "logo.png"
-    productWelcome:      "languages.png"
-
-slideshow:               "show.qml"
-
-style:
-   sidebarBackground:    "#454948"
-   sidebarText:          "#efefef"
-   sidebarTextSelect:    "#9E4F5D"