diff --git a/community/bspwm-mate/Packages-Desktop b/community/bspwm-mate/Packages-Desktop
index 5b8161a..78fbf81 100644
--- a/community/bspwm-mate/Packages-Desktop
+++ b/community/bspwm-mate/Packages-Desktop
@@ -45,7 +45,6 @@ dconf-editor
 feh
 gnome-keyring
 gksu
-gtk3-classic
 android-tools
 android-udev
 gvfs
diff --git a/community/bspwm/Packages-Desktop b/community/bspwm/Packages-Desktop
index f5b260a..c8e0b14 100644
--- a/community/bspwm/Packages-Desktop
+++ b/community/bspwm/Packages-Desktop
@@ -16,7 +16,6 @@
 >extra firefox
 >extra gestures
 >extra gnome-disk-utility
->extra gtk3-classic
 >extra gufw
 >extra gvfs
 >extra gvfs-afc
@@ -123,4 +122,4 @@ xorg-xprop
 xorg-xsetroot
 zensu
 zsh-completions
-highlight
\ No newline at end of file
+highlight
diff --git a/community/lxqt/Packages-Desktop b/community/lxqt/Packages-Desktop
index 6071e8d..089f902 100644
--- a/community/lxqt/Packages-Desktop
+++ b/community/lxqt/Packages-Desktop
@@ -207,7 +207,6 @@ freetype2
 accountsservice
 gksu-polkit
 gnome-keyring
-gtk3-classic
 manjaro-hotfixes
 perl-file-mimeinfo
 polkit
diff --git a/manjaro/plasma-mobile/Packages-Desktop b/manjaro/plasma-mobile/Packages-Desktop
new file mode 100644
index 0000000..263783d
--- /dev/null
+++ b/manjaro/plasma-mobile/Packages-Desktop
@@ -0,0 +1,165 @@
+## Network
+avahi
+networkmanager
+#networkmanager-openconnect
+#networkmanager-openvpn
+#networkmanager-pptp
+#networkmanager-vpnc
+nss-mdns # NSS support for mDNS (optdepend for avahi)
+ntp
+mobile-broadband-provider-info
+modemmanager
+openresolv
+openssh
+samba
+usb_modeswitch
+
+## Libraries for Sound/Audio/Video
+alsa-firmware
+alsa-utils
+ffmpeg
+gst-libav
+gst-plugins-bad
+gst-plugins-base
+gst-plugins-good
+gst-plugins-ugly
+libcanberra
+>multilib lib32-libcanberra
+libcanberra-pulse
+>multilib lib32-libcanberra-pulse
+libcanberra-gstreamer
+libdvdcss
+manjaro-alsa
+manjaro-pulse
+phonon-qt5-gstreamer
+pulseaudio-bluetooth
+pulseaudio-ctl
+pulseaudio-zeroconf
+
+## Connect Packages
+android-tools
+android-udev
+gvfs
+gvfs-afc
+gvfs-gphoto2
+gvfs-mtp
+gvfs-nfs
+gvfs-smb
+kamera
+mtpfs
+udiskie
+udisks2
+
+## AUR Support/Development
+# Missing base-devel packages
+>extra autoconf
+>extra automake
+>extra binutils
+>extra bison
+>extra fakeroot
+>extra flex
+>extra gcc
+>extra >multilib gcc-libs-multilib
+>extra >multilib gcc-multilib
+>extra libtool
+>extra m4
+>extra make
+>extra patch
+>extra pkg-config
+>extra >multilib lib32-flex
+# Extra packages for AUR support
+>extra git
+>extra patchutils
+>extra subversion
+#yaourt
+
+## Fonts
+# cantarell-fonts        # Installed as gnome-themes-standard dependency
+noto-fonts               # default font
+noto-fonts-cjk           # asian fonts - needed big package, ~76 mb compressed
+>extra noto-fonts-emoji
+terminus-font
+>extra ttf-bitstream-vera
+# ttf-dejavu             # Installed as gnome-themes-standard dependency
+# ttf-hack               # Installed as plasma-integration dependency
+>extra ttf-inconsolata
+>extra ttf-indic-otf
+>extra ttf-liberation
+>extra ttf-droid
+
+## Xorg Input Drivers
+xf86-input-elographics
+xf86-input-evdev
+xf86-input-keyboard
+xf86-input-libinput
+xf86-input-mouse
+xf86-input-void
+
+## Xorg Server and Graphics
+>multilib lib32-libva-intel-driver
+>multilib lib32-libva-mesa-driver
+>multilib lib32-libva-vdpau-driver
+libva-intel-driver
+libva-mesa-driver
+libva-vdpau-driver
+mesa-demos
+>multilib lib32-mesa-demos
+numlockx
+xdg-user-dirs
+xorg-server
+xorg-server-xwayland
+xorg-twm
+xorg-xinit
+xorg-xkill
+
+## Themes
+
+breath-icon-theme
+plasma5-themes-breath
+sddm-breath-theme
+
+## Display manager
+sddm
+#sddm-kcm
+
+## Plasma5
+plasma-settings # Settings application and modules.
+plasma-camera # Camera application.
+marble # Maps application.
+koko # Gallery application.
+#vvave # Music player.
+okular # Document Viewer.
+#discover # Software Center.
+plasma-angelfish # Webbrowser for phones.
+#plasma-samegame # Small example game, pure QML.
+#mtp-server # Fork of Ubuntu’s MTP server
+kaidan # XMPP based Messenger.
+qmlkonsole # Terminal application.
+peruse # A comic book viewer.
+calindori # Calendar and todo management application.
+#plasmatube # Work-in-progress youtube client.
+index # File manager.
+#plasma-pix # Maui Image Gallery.
+#qrca # QR Code scanner.
+keysmith # OTP client.
+plasma-nano
+
+## Plasma phone components
+#simplelogin # Display manager for launching the plasma-phone shell
+plasma-phone-components # Dialer and Phone shell QtQuick code, application launcher model, etc.
+kpeoplevcard # Provides the vCard based contact management backend used by the dialer, plasma-phonebook and others.
+plasma-phonebook # Contact management application.
+spacebar # Work-in-progress SMS application.
+
+## Applications
+qt5-virtualkeyboard
+phonesim
+ofono
+libqofono
+konsole
+
+## Maui Applications
+dialer
+
+## Optional dependencies for okular
+poppler-data  # encoding data to display PDF documents containing CJK characters
diff --git a/manjaro/plasma-mobile/Packages-Live b/manjaro/plasma-mobile/Packages-Live
new file mode 120000
index 0000000..5e66e00
--- /dev/null
+++ b/manjaro/plasma-mobile/Packages-Live
@@ -0,0 +1 @@
+../../shared/Packages-Live
\ No newline at end of file
diff --git a/manjaro/plasma-mobile/Packages-Mhwd b/manjaro/plasma-mobile/Packages-Mhwd
new file mode 120000
index 0000000..9df3d5e
--- /dev/null
+++ b/manjaro/plasma-mobile/Packages-Mhwd
@@ -0,0 +1 @@
+../../shared/Packages-Mhwd
\ No newline at end of file
diff --git a/manjaro/plasma-mobile/Packages-Root b/manjaro/plasma-mobile/Packages-Root
new file mode 120000
index 0000000..60cc7bd
--- /dev/null
+++ b/manjaro/plasma-mobile/Packages-Root
@@ -0,0 +1 @@
+../../shared/Packages-Root
\ No newline at end of file
diff --git a/oem/infinitybookpro-oem-kde/desktop-overlay/etc/pam.d/sddm b/manjaro/plasma-mobile/desktop-overlay/etc/pam.d/sddm
similarity index 100%
rename from oem/infinitybookpro-oem-kde/desktop-overlay/etc/pam.d/sddm
rename to manjaro/plasma-mobile/desktop-overlay/etc/pam.d/sddm
diff --git a/oem/infinitybookpro-oem-kde/desktop-overlay/etc/sddm.conf b/manjaro/plasma-mobile/desktop-overlay/etc/sddm.conf
similarity index 98%
rename from oem/infinitybookpro-oem-kde/desktop-overlay/etc/sddm.conf
rename to manjaro/plasma-mobile/desktop-overlay/etc/sddm.conf
index 9f46d10..93d52a8 100644
--- a/oem/infinitybookpro-oem-kde/desktop-overlay/etc/sddm.conf
+++ b/manjaro/plasma-mobile/desktop-overlay/etc/sddm.conf
@@ -3,11 +3,10 @@
 Relogin=false
 
 # Name of session file for autologin session (if empty try last logged in)
-Session=plasma.desktop
+Session=plasma-mobile.desktop
 
 # Username for autologin session
-User=
-
+User=manjaro
 
 [General]
 # Halt command
@@ -24,7 +23,6 @@ Numlock=none
 # Reboot command
 RebootCommand=/usr/bin/systemctl reboot
 
-
 [Theme]
 # Current theme name
 Current=breath
@@ -125,5 +123,4 @@ XauthPath=/usr/bin/xauth
 
 # Path to Xephyr binary
 XephyrPath=/usr/bin/Xephyr
-
-
+ 
diff --git a/manjaro/plasma-mobile/desktop-overlay/etc/skel/.config/environment.d/envvars.conf b/manjaro/plasma-mobile/desktop-overlay/etc/skel/.config/environment.d/envvars.conf
new file mode 100644
index 0000000..10bf215
--- /dev/null
+++ b/manjaro/plasma-mobile/desktop-overlay/etc/skel/.config/environment.d/envvars.conf
@@ -0,0 +1,7 @@
+QT_QPA_PLATFORM=wayland
+QT_QPA_PLATFORMTHEME=KDE
+QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+XDG_CURRENT_DESKTOP=KDE
+KSCREEN_BACKEND=QScreen
+KDE_FULL_SESSION=1
+KDE_SESSION_VERSION=5
diff --git a/oem/infinitybookpro-oem-kde/desktop-overlay/etc/sysctl.d/50-max_user_watches.conf b/manjaro/plasma-mobile/desktop-overlay/etc/sysctl.d/50-max_user_watches.conf
similarity index 100%
rename from oem/infinitybookpro-oem-kde/desktop-overlay/etc/sysctl.d/50-max_user_watches.conf
rename to manjaro/plasma-mobile/desktop-overlay/etc/sysctl.d/50-max_user_watches.conf
diff --git a/oem/infinitybookpro-oem-kde/desktop-overlay/usr/share/icons/default/index.theme b/manjaro/plasma-mobile/desktop-overlay/usr/share/icons/default/index.theme
similarity index 100%
rename from oem/infinitybookpro-oem-kde/desktop-overlay/usr/share/icons/default/index.theme
rename to manjaro/plasma-mobile/desktop-overlay/usr/share/icons/default/index.theme
diff --git a/manjaro/plasma-mobile/live-overlay/etc/default b/manjaro/plasma-mobile/live-overlay/etc/default
new file mode 120000
index 0000000..812b9ff
--- /dev/null
+++ b/manjaro/plasma-mobile/live-overlay/etc/default
@@ -0,0 +1 @@
+../../../../shared/manjaro/live-overlay/etc/default
\ No newline at end of file
diff --git a/manjaro/plasma-mobile/live-overlay/etc/fstab b/manjaro/plasma-mobile/live-overlay/etc/fstab
new file mode 120000
index 0000000..8750aca
--- /dev/null
+++ b/manjaro/plasma-mobile/live-overlay/etc/fstab
@@ -0,0 +1 @@
+../../../../shared/manjaro/live-overlay/etc/fstab
\ No newline at end of file
diff --git a/manjaro/plasma-mobile/live-overlay/etc/issue b/manjaro/plasma-mobile/live-overlay/etc/issue
new file mode 120000
index 0000000..c519805
--- /dev/null
+++ b/manjaro/plasma-mobile/live-overlay/etc/issue
@@ -0,0 +1 @@
+../../../../shared/manjaro/live-overlay/etc/issue
\ No newline at end of file
diff --git a/manjaro/plasma-mobile/live-overlay/etc/pam.d b/manjaro/plasma-mobile/live-overlay/etc/pam.d
new file mode 120000
index 0000000..68de596
--- /dev/null
+++ b/manjaro/plasma-mobile/live-overlay/etc/pam.d
@@ -0,0 +1 @@
+../../../../shared/manjaro/live-overlay/etc/pam.d
\ No newline at end of file
diff --git a/manjaro/plasma-mobile/live-overlay/etc/skel/.config/kcmdisplayrc b/manjaro/plasma-mobile/live-overlay/etc/skel/.config/kcmdisplayrc
new file mode 100644
index 0000000..32d417f
--- /dev/null
+++ b/manjaro/plasma-mobile/live-overlay/etc/skel/.config/kcmdisplayrc
@@ -0,0 +1,9 @@
+[X11]
+exportKDEColors=true
+exportKDEFonts=false
+
+[DisplayEnergy]
+displayEnergySaving=false
+displayStandby=7
+displaySuspend=13
+displayPowerOff=19
diff --git a/manjaro/plasma-mobile/live-overlay/etc/skel/.config/kscreenlockerrc b/manjaro/plasma-mobile/live-overlay/etc/skel/.config/kscreenlockerrc
new file mode 100755
index 0000000..d9c11d9
--- /dev/null
+++ b/manjaro/plasma-mobile/live-overlay/etc/skel/.config/kscreenlockerrc
@@ -0,0 +1,3 @@
+[Daemon]
+Autolock=false
+Timeout=0
\ No newline at end of file
diff --git a/manjaro/plasma-mobile/live-overlay/etc/skel/.config/kwalletrc b/manjaro/plasma-mobile/live-overlay/etc/skel/.config/kwalletrc
new file mode 100644
index 0000000..ba04734
--- /dev/null
+++ b/manjaro/plasma-mobile/live-overlay/etc/skel/.config/kwalletrc
@@ -0,0 +1,11 @@
+[Wallet]
+Close When Idle=false
+Close on Screensaver=false
+Enabled=false
+Idle Timeout=10
+Launch Manager=false
+Leave Manager Open=false
+Leave Open=true
+Prompt on Open=false
+Use One Wallet=true
+
diff --git a/manjaro/plasma-mobile/live-overlay/etc/skel/.config/manjaro b/manjaro/plasma-mobile/live-overlay/etc/skel/.config/manjaro
new file mode 120000
index 0000000..3a25db6
--- /dev/null
+++ b/manjaro/plasma-mobile/live-overlay/etc/skel/.config/manjaro
@@ -0,0 +1 @@
+../../../../../../shared/manjaro/live-overlay/etc/skel/.config/manjaro
\ No newline at end of file
diff --git a/oem/infinitybook14-oem-kde/live-overlay/etc/xdg/kdeglobals b/manjaro/plasma-mobile/live-overlay/etc/xdg/kdeglobals
similarity index 100%
rename from oem/infinitybook14-oem-kde/live-overlay/etc/xdg/kdeglobals
rename to manjaro/plasma-mobile/live-overlay/etc/xdg/kdeglobals
diff --git a/manjaro/plasma-mobile/profile.conf b/manjaro/plasma-mobile/profile.conf
new file mode 100644
index 0000000..ac24813
--- /dev/null
+++ b/manjaro/plasma-mobile/profile.conf
@@ -0,0 +1,81 @@
+##########################################
+###### use this file in the profile ######
+##########################################
+
+# use multilib packages; x86_64 only
+# multilib="true"
+
+displaymanager="sddm"
+
+# Set to false to disable autologin in the livecd
+# autologin="true"
+
+# nonfree mhwd drivers
+# nonfree_mhwd="true"
+
+# use extra packages as defined in pkglist to activate a full profile
+# extra="false"
+# extra="true"
+
+################ install ################
+
+# unset defaults to given value
+# efi_boot_loader="grub"
+
+# configure calamares for netinstall
+# netinstall="false"
+
+# configure calamares to use chrootcfg instead of unpackfs
+# chrootcfg="false"
+
+# use geoip for localization
+# geoip='true'
+
+# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store"
+# strict_snaps=""
+# add classic snaps: classic_snaps="code"
+# classic_snaps=""
+# choose the snap channel. Possible options are: stable, candidate, beta, edge
+# snap_channel="candidate"
+
+# unset defaults to given values
+# names must match systemd service names
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'apparmor' 'snapd.apparmor' 'snapd')
+#enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged')
+disable_systemd=('pacman-init')
+
+# unset defaults to given values,
+# names must match openrc service names
+# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
+# disable_openrc=()
+
+# the same workgroup name if samba is used
+# smb_workgroup=""
+
+################# livecd #################
+
+# unset defaults to given value
+# hostname="manjaro"
+
+# unset defaults to given value
+# username="manjaro"
+
+# unset defaults to given value
+# password="manjaro"
+
+# the login shell
+# defaults to bash
+# login_shell=/bin/bash
+
+# unset defaults to given values
+# addgroups="lp,network,power,wheel"
+
+# unset defaults to given values
+# names must match systemd service names
+# services in enable_systemd array don't need to be listed here
+# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
+
+# unset defaults to given values,
+# names must match openrc service names
+# services in enable_openrc array don't need to be listed here
+# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
diff --git a/oem/bladebook-oem-i3/Packages-Desktop b/oem/bladebook-oem-i3/Packages-Desktop
index f98bcad..b740928 100644
--- a/oem/bladebook-oem-i3/Packages-Desktop
+++ b/oem/bladebook-oem-i3/Packages-Desktop
@@ -44,7 +44,6 @@ grub-theme-manjaro-dev
 >extra gst-plugins-good
 >extra gst-plugins-ugly
 >extra gstreamer
-gtk3-classic
 >extra gtksourceview-pkgbuild
 >extra gufw
 gvfs
diff --git a/oem/bladebook-oem-xfce/Packages-Desktop b/oem/bladebook-oem-xfce/Packages-Desktop
index 558598a..4da2f52 100644
--- a/oem/bladebook-oem-xfce/Packages-Desktop
+++ b/oem/bladebook-oem-xfce/Packages-Desktop
@@ -114,10 +114,6 @@ lightdm-gtk-greeter
 lightdm-gtk-greeter-settings
 accountsservice  # Enhanced user accounts handling
 
-## GTK3
-gtk3-classic
->multilib lib32-gtk3-classic
-
 ## XFCE Group
 exo-gtk3
 garcon-gtk3
diff --git a/oem/infinitybook14-oem-kde/Packages-Desktop b/oem/infinitybook14-oem-kde/Packages-Desktop
index 6cef643..0997c9a 100644
--- a/oem/infinitybook14-oem-kde/Packages-Desktop
+++ b/oem/infinitybook14-oem-kde/Packages-Desktop
@@ -87,9 +87,12 @@ terminus-font
 >extra ttf-liberation
 >extra ttf-droid
 
+## Games
+>x86_64 >extra steam-manjaro
+
 ## Package management
 #appimagelauncher
-pamac-gtk
+pamac
 pamac-tray-appindicator
 pamac-cli
 >extra apparmor
@@ -166,11 +169,9 @@ user-manager
 gnome-icon-theme
 gnome-themes-standard
 gtk-theme-breath
-manjaro-icons-tx
 oxygen # needed to provide KDE system sounds
 oxygen-icons
-plasma5-themes-breath  # Default
-sddm-breath-theme  # Default
+sddm-breath2-theme
 grub-theme-manjaro
 illyria-wallpaper
 >extra wallpapers-juhraya
@@ -264,9 +265,9 @@ inxi
 #>extra krita
 >extra firefox
 >basic falkon
-ms-office-online
+#ms-office-online
 #>extra freeoffice
->extra libreoffice-still
+#>extra libreoffice-still
 #>extra calligra
 manjaro-hello
 manjaro-settings-manager-kcm
@@ -324,16 +325,16 @@ perl-file-mimeinfo
 xdg-utils
 xdg-su
 >extra timeshift
+>extra kernel-alive
 
 ## Misc
 manjaro-hotfixes
->basic squashfs-tools
 
 ## Flatpak support
 >extra flatpak
 >extra xdg-desktop-portal
 >extra xdg-desktop-portal-kde
 
+## OEM
 calamares-oem-modules
 calamares-oem-infbkpro-kde-settings
-grub-theme-live-manjaro
diff --git a/oem/infinitybook14-oem-kde/desktop-overlay/etc/sddm.conf b/oem/infinitybook14-oem-kde/desktop-overlay/etc/sddm.conf
index 9f46d10..0318f95 100644
--- a/oem/infinitybook14-oem-kde/desktop-overlay/etc/sddm.conf
+++ b/oem/infinitybook14-oem-kde/desktop-overlay/etc/sddm.conf
@@ -8,7 +8,6 @@ Session=plasma.desktop
 # Username for autologin session
 User=
 
-
 [General]
 # Halt command
 HaltCommand=/usr/bin/systemctl poweroff
@@ -24,10 +23,9 @@ Numlock=none
 # Reboot command
 RebootCommand=/usr/bin/systemctl reboot
 
-
 [Theme]
 # Current theme name
-Current=breath
+Current=breath2
 
 # Cursor theme used in the greeter
 CursorTheme=breeze_cursors
@@ -47,7 +45,6 @@ FacesDir=/usr/share/sddm/faces
 # Theme directory path
 ThemeDir=/usr/share/sddm/themes
 
-
 [Users]
 # Default $PATH for logged in users
 DefaultPath=/usr/local/sbin:/usr/local/bin:/usr/bin
@@ -74,7 +71,6 @@ RememberLastUser=true
 # When logging in as the same user twice, restore the original session, rather than create a new one
 ReuseSession=false
 
-
 [Wayland]
 # Enable Qt's automatic high-DPI scaling
 EnableHiDPI=false
@@ -88,7 +84,6 @@ SessionDir=/usr/share/wayland-sessions
 # Path to the user session log file
 SessionLogFile=.local/share/sddm/wayland-session.log
 
-
 [X11]
 # Path to a script to execute when starting the display server
 DisplayCommand=/usr/share/sddm/scripts/Xsetup
@@ -125,5 +120,3 @@ XauthPath=/usr/bin/xauth
 
 # Path to Xephyr binary
 XephyrPath=/usr/bin/Xephyr
-
-
diff --git a/oem/infinitybook14-oem-kde/desktop-overlay/etc/sysctl.d/99-swappiness.conf b/oem/infinitybook14-oem-kde/desktop-overlay/etc/sysctl.d/99-swappiness.conf
index b700b4d..51c6fc3 100644
--- a/oem/infinitybook14-oem-kde/desktop-overlay/etc/sysctl.d/99-swappiness.conf
+++ b/oem/infinitybook14-oem-kde/desktop-overlay/etc/sysctl.d/99-swappiness.conf
@@ -1 +1 @@
-vm.swappiness=10
\ No newline at end of file
+vm.swappiness=10
diff --git a/oem/infinitybook14-oem-kde/desktop-overlay/usr/bin/calamares_polkit b/oem/infinitybook14-oem-kde/desktop-overlay/usr/bin/calamares_polkit
new file mode 100755
index 0000000..a8538aa
--- /dev/null
+++ b/oem/infinitybook14-oem-kde/desktop-overlay/usr/bin/calamares_polkit
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo -E calamares
diff --git a/oem/infinitybookpro-oem-kde/Packages-Desktop b/oem/infinitybookpro-oem-kde/Packages-Desktop
index 528546b..0a4d393 100644
--- a/oem/infinitybookpro-oem-kde/Packages-Desktop
+++ b/oem/infinitybookpro-oem-kde/Packages-Desktop
@@ -171,8 +171,7 @@ gnome-themes-standard
 gtk-theme-breath
 oxygen # needed to provide KDE system sounds
 oxygen-icons
-plasma5-themes-breath  # Default
-sddm-breath-theme  # Default
+sddm-breath2-theme
 grub-theme-manjaro
 illyria-wallpaper
 >extra wallpapers-juhraya
diff --git a/oem/infinitybookpro-oem-kde/Packages-Live b/oem/infinitybookpro-oem-kde/Packages-Live
deleted file mode 100644
index a6851f2..0000000
--- a/oem/infinitybookpro-oem-kde/Packages-Live
+++ /dev/null
@@ -1,5 +0,0 @@
-grub-theme-live-manjaro
-manjaro-live-skel
-manjaro-live-systemd
-mkinitcpio-nfs-utils
-nbd
diff --git a/oem/infinitybookpro-oem-kde/Packages-Live b/oem/infinitybookpro-oem-kde/Packages-Live
new file mode 120000
index 0000000..ef77d2f
--- /dev/null
+++ b/oem/infinitybookpro-oem-kde/Packages-Live
@@ -0,0 +1 @@
+../infinitybook14-oem-kde/Packages-Live
\ No newline at end of file
diff --git a/oem/infinitybookpro-oem-kde/desktop-overlay/etc b/oem/infinitybookpro-oem-kde/desktop-overlay/etc
new file mode 120000
index 0000000..78c1146
--- /dev/null
+++ b/oem/infinitybookpro-oem-kde/desktop-overlay/etc
@@ -0,0 +1 @@
+../../infinitybook14-oem-kde/desktop-overlay/etc/
\ No newline at end of file
diff --git a/oem/infinitybookpro-oem-kde/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf b/oem/infinitybookpro-oem-kde/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf
deleted file mode 100644
index 4bd1a17..0000000
--- a/oem/infinitybookpro-oem-kde/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
-    Identifier "touchpad"
-    Driver "libinput"
-    MatchIsTouchpad "on"
-    Option "Tapping" "on"
-EndSection
diff --git a/oem/infinitybookpro-oem-kde/desktop-overlay/etc/sysctl.d/99-swappiness.conf b/oem/infinitybookpro-oem-kde/desktop-overlay/etc/sysctl.d/99-swappiness.conf
deleted file mode 100644
index 51c6fc3..0000000
--- a/oem/infinitybookpro-oem-kde/desktop-overlay/etc/sysctl.d/99-swappiness.conf
+++ /dev/null
@@ -1 +0,0 @@
-vm.swappiness=10
diff --git a/oem/infinitybookpro-oem-kde/desktop-overlay/usr b/oem/infinitybookpro-oem-kde/desktop-overlay/usr
new file mode 120000
index 0000000..c31ec48
--- /dev/null
+++ b/oem/infinitybookpro-oem-kde/desktop-overlay/usr
@@ -0,0 +1 @@
+../../infinitybook14-oem-kde/desktop-overlay/usr/
\ No newline at end of file
diff --git a/oem/infinitybookpro-oem-kde/live-overlay/usr b/oem/infinitybookpro-oem-kde/live-overlay/usr
index 8aca2d5..edeb8c5 120000
--- a/oem/infinitybookpro-oem-kde/live-overlay/usr
+++ b/oem/infinitybookpro-oem-kde/live-overlay/usr
@@ -1 +1 @@
-../../../shared/oem/live-overlay/usr
\ No newline at end of file
+../../infinitybook14-oem-kde/live-overlay/usr/
\ No newline at end of file
diff --git a/oem/spitfire-oem-xfce/Packages-Desktop b/oem/spitfire-oem-xfce/Packages-Desktop
index 76d7158..bef5bf9 100644
--- a/oem/spitfire-oem-xfce/Packages-Desktop
+++ b/oem/spitfire-oem-xfce/Packages-Desktop
@@ -117,10 +117,6 @@ lightdm-slick-greeter
 lightdm-settings
 accountsservice  # Enhanced user accounts handling
 
-## GTK3
-gtk3-classic
->multilib lib32-gtk3-classic
-
 ## XFCE Group
 exo-gtk3
 garcon-gtk3