diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index 5032ed8..9ebab5c 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -100,6 +100,7 @@ nss-mdns
 numlockx
 openresolv
 pamac
+flatpak
 polkit-gnome
 powertop
 pulseaudio-bluetooth
diff --git a/manjaro/gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig b/manjaro/gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig
index 037dc92..c1615a1 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=Arc
+theme=KvArcMaia
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index 1971ad2..dfc1da6 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -83,6 +83,7 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 
 ## Package management
 pamac
+flatpak
 
 ## Java
 >extra jdk8-openjdk
diff --git a/manjaro/xfce/live-overlay b/manjaro/xfce/live-overlay
deleted file mode 120000
index 27b9d2a..0000000
--- a/manjaro/xfce/live-overlay
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/manjaro/live-overlay
\ No newline at end of file
diff --git a/manjaro/xfce/live-overlay/etc b/manjaro/xfce/live-overlay/etc
new file mode 120000
index 0000000..caab87d
--- /dev/null
+++ b/manjaro/xfce/live-overlay/etc
@@ -0,0 +1 @@
+../../../shared/manjaro/live-overlay/etc
\ No newline at end of file
diff --git a/manjaro/xfce/live-overlay/root/.config/Kvantum/kvantum.kvconfig b/manjaro/xfce/live-overlay/root/.config/Kvantum/kvantum.kvconfig
new file mode 100644
index 0000000..dd3d882
--- /dev/null
+++ b/manjaro/xfce/live-overlay/root/.config/Kvantum/kvantum.kvconfig
@@ -0,0 +1,2 @@
+[General]
+theme=KvMatchaSea
diff --git a/manjaro/xfce/live-overlay/root/.config/qt5ct/qt5ct.conf b/manjaro/xfce/live-overlay/root/.config/qt5ct/qt5ct.conf
new file mode 100644
index 0000000..372a44a
--- /dev/null
+++ b/manjaro/xfce/live-overlay/root/.config/qt5ct/qt5ct.conf
@@ -0,0 +1,24 @@
+[Appearance]
+color_scheme_path=
+custom_palette=false
+icon_theme=Papirus-Adapta-Maia
+style=kvantum
+
+[Fonts]
+fixed=@Variant(\0\0\0@\0\0\0\x12\0\x43\0\x61\0n\0t\0\x61\0r\0\x65\0l\0l@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+general=@Variant(\0\0\0@\0\0\0\x12\0\x43\0\x61\0n\0t\0\x61\0r\0\x65\0l\0l@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+
+[Interface]
+activate_item_on_single_click=1
+buttonbox_layout=0
+cursor_flash_time=1000
+dialog_buttons_have_icons=1
+double_click_interval=400
+gui_effects=@Invalid()
+menus_have_icons=true
+stylesheets=@Invalid()
+toolbutton_style=4
+wheel_scroll_lines=3
+
+[SettingsWindow]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\x1\x9a\0\0\0\x80\0\0\x3\xd6\0\0\x2\xff\0\0\x1\x9a\0\0\0\xa2\0\0\x3\xd6\0\0\x2\xff\0\0\0\0\0\0\0\0\x5V)
diff --git a/manjaro/xfce/live-overlay/usr b/manjaro/xfce/live-overlay/usr
new file mode 120000
index 0000000..b56c83d
--- /dev/null
+++ b/manjaro/xfce/live-overlay/usr
@@ -0,0 +1 @@
+../../../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
index a6b5784..60ec738 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-rc-1
-    shortVersion:        18.0-rc-1
-    versionedName:       Manjaro Linux 18.0-rc-1 "Illyria"
-    shortVersionedName:  Manjaro 18.0-rc-1
+    version:             18.0-rc2
+    shortVersion:        18.0-rc2
+    versionedName:       Manjaro Linux 18.0-rc2 "Illyria"
+    shortVersionedName:  Manjaro 18.0-rc2
     bootloaderEntryName: Manjaro
 
 images: