diff --git a/community/lxqt/Packages-Desktop b/community/lxqt/Packages-Desktop
index 0706f99..6071e8d 100644
--- a/community/lxqt/Packages-Desktop
+++ b/community/lxqt/Packages-Desktop
@@ -167,7 +167,7 @@ networkmanager-qt
 openresolv
 
 ##------------> core
-compton
+picom
 compton-conf
 lxqt-about
 lxqt-admin
diff --git a/community/openbox/Packages-Desktop b/community/openbox/Packages-Desktop
index 9ccaeb6..39ebc1e 100644
--- a/community/openbox/Packages-Desktop
+++ b/community/openbox/Packages-Desktop
@@ -236,7 +236,7 @@ ttf-roboto
 
 ##---------> core
 arandr
-compton
+picom
 conky-lua-nv
 dunst
 exo-gtk3
diff --git a/oem/bladebook-oem-kde/Packages-Desktop b/oem/bladebook-oem-kde/Packages-Desktop
index 33c2a3b..24b3185 100644
--- a/oem/bladebook-oem-kde/Packages-Desktop
+++ b/oem/bladebook-oem-kde/Packages-Desktop
@@ -319,4 +319,4 @@ manjaro-hotfixes
 
 ## OEM
 calamares-oem-modules
-calamares-oem-bldbk-settings
+calamares-oem-bldbk-kde-settings
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index 5830822..5936d72 100644
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@@ -14,7 +14,7 @@ KERNEL-virtualbox-guest-modules
 libva-intel-driver
 libva-mesa-driver
 libva-vdpau-driver
->multilib lib32-libva-vdpau-driver 
+>multilib lib32-libva-vdpau-driver
 libxaw
 libxpm
 libxvmc
@@ -24,7 +24,7 @@ mesa-vdpau
 >multilib lib32-primus
 #>nonfree_default catalyst-utils
 #>nonfree_default KERNEL-catalyst
->nonfree_default KERNEL-nvidia-340xx
+#>nonfree_default KERNEL-nvidia-340xx
 >nonfree_default KERNEL-nvidia-390xx
 >nonfree_x86_64 KERNEL-nvidia-418xx
 >nonfree_default nvidia-340xx-utils
@@ -32,7 +32,7 @@ mesa-vdpau
 >nonfree_x86_64 nvidia-418xx-utils
 #>nonfree_multilib lib32-catalyst-utils
 >nonfree_multilib lib32-nvidia-418xx-utils
->nonfree_multilib lib32-nvidia-340xx-utils
+#>nonfree_multilib lib32-nvidia-340xx-utils
 >nonfree_multilib lib32-nvidia-390xx-utils
 opencl-mesa
 open-vm-tools