diff --git a/community/budgie/Packages-Desktop b/community/budgie/Packages-Desktop
index 2c283ef..2f10338 100644
--- a/community/budgie/Packages-Desktop
+++ b/community/budgie/Packages-Desktop
@@ -168,3 +168,13 @@ timeshift
 #>extra patch
 #>extra subversion
 manjaro-aur-support
+
+# mbp
+linux56-mbp-headers
+linux56-mbp-docs
+linux56-mbp-zfs
+linux56-mbp-bbswitch
+linux56-mbp-broadcom-wl
+linux56-mbp-virtualbox-guest-modules
+linux56-mbp-virtualbox-host-modules
+apple-bce-dkms-git
diff --git a/community/budgie/profile.conf b/community/budgie/profile.conf
index 1c5fc9c..20d22a6 100644
--- a/community/budgie/profile.conf
+++ b/community/budgie/profile.conf
@@ -20,7 +20,7 @@ displaymanager="lightdm"
 # nonfree_mhwd="false"
 
 # possible values: grub;systemd-boot
-# efi_boot_loader="grub"
+efi_boot_loader="systemd-boot"
 
 # configure calamares for netinstall
 # netinstall="true"
diff --git a/community/budgie/user-repos.conf b/community/budgie/user-repos.conf
new file mode 100644
index 0000000..d3e28ed
--- /dev/null
+++ b/community/budgie/user-repos.conf
@@ -0,0 +1,3 @@
+[mbp]
+SigLevel = Optional TrustAll
+Server = http://jacobpyke.xyz:8080/archlinux/$repo/$arch
diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop
index 2cfb707..47c4334 100644
--- a/community/cinnamon/Packages-Desktop
+++ b/community/cinnamon/Packages-Desktop
@@ -160,3 +160,13 @@ xorg-xkill
 >extra yay
 yelp
 zensu
+
+# mbp
+linux56-mbp-headers
+linux56-mbp-docs
+linux56-mbp-zfs
+linux56-mbp-bbswitch
+linux56-mbp-broadcom-wl
+linux56-mbp-virtualbox-guest-modules
+linux56-mbp-virtualbox-host-modules
+apple-bce-dkms-git
diff --git a/community/cinnamon/profile.conf b/community/cinnamon/profile.conf
index b730d5f..389ea3b 100644
--- a/community/cinnamon/profile.conf
+++ b/community/cinnamon/profile.conf
@@ -4,6 +4,8 @@ displaymanager="lightdm"
 
 nonfree_mhwd="true"
 
+efi_boot_loader="systemd-boot"
+
 enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
 
 disable_systemd=('pacman-init')
diff --git a/community/cinnamon/user-repos.conf b/community/cinnamon/user-repos.conf
new file mode 100644
index 0000000..d3e28ed
--- /dev/null
+++ b/community/cinnamon/user-repos.conf
@@ -0,0 +1,3 @@
+[mbp]
+SigLevel = Optional TrustAll
+Server = http://jacobpyke.xyz:8080/archlinux/$repo/$arch
diff --git a/community/i3/Packages-Desktop b/community/i3/Packages-Desktop
index 5a3c730..473bc66 100644
--- a/community/i3/Packages-Desktop
+++ b/community/i3/Packages-Desktop
@@ -163,3 +163,13 @@ xdg-user-dirs
 xorg-server
 >extra yay
 zensu
+
+# mbp
+linux56-mbp-headers
+linux56-mbp-docs
+linux56-mbp-zfs
+linux56-mbp-bbswitch
+linux56-mbp-broadcom-wl
+linux56-mbp-virtualbox-guest-modules
+linux56-mbp-virtualbox-host-modules
+apple-bce-dkms-git
diff --git a/community/i3/profile.conf b/community/i3/profile.conf
index b5256e9..c06a643 100644
--- a/community/i3/profile.conf
+++ b/community/i3/profile.conf
@@ -18,7 +18,7 @@ displaymanager="lightdm"
 nonfree_mhwd="true"
 
 # possible values: grub;systemd-boot
-# efi_boot_loader="grub"
+efi_boot_loader="systemd-boot"
 
 # configure calamares for netinstall
 # netinstall="false"
diff --git a/community/i3/user-repos.conf b/community/i3/user-repos.conf
new file mode 100644
index 0000000..d3e28ed
--- /dev/null
+++ b/community/i3/user-repos.conf
@@ -0,0 +1,3 @@
+[mbp]
+SigLevel = Optional TrustAll
+Server = http://jacobpyke.xyz:8080/archlinux/$repo/$arch
diff --git a/community/lxde/Packages-Desktop b/community/lxde/Packages-Desktop
index 930db89..db6138a 100644
--- a/community/lxde/Packages-Desktop
+++ b/community/lxde/Packages-Desktop
@@ -242,3 +242,13 @@ xorg-xinit
 xorg-xkill
 xorg-xprop
 xorg-xwininfo
+
+# mbp
+linux56-mbp-headers
+linux56-mbp-docs
+linux56-mbp-zfs
+linux56-mbp-bbswitch
+linux56-mbp-broadcom-wl
+linux56-mbp-virtualbox-guest-modules
+linux56-mbp-virtualbox-host-modules
+apple-bce-dkms-git
diff --git a/community/webdad/user-repos.conf b/community/webdad/user-repos.conf
new file mode 100644
index 0000000..d3e28ed
--- /dev/null
+++ b/community/webdad/user-repos.conf
@@ -0,0 +1,3 @@
+[mbp]
+SigLevel = Optional TrustAll
+Server = http://jacobpyke.xyz:8080/archlinux/$repo/$arch
diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index b138953..d88c88d 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -189,3 +189,13 @@ xorg-xinit
 
 >basic lighter-gnome
 >basic disable-tracker
+
+# mbp
+linux56-mbp-headers
+linux56-mbp-docs
+linux56-mbp-zfs
+linux56-mbp-bbswitch
+linux56-mbp-broadcom-wl
+linux56-mbp-virtualbox-guest-modules
+linux56-mbp-virtualbox-host-modules
+apple-bce-dkms-git
diff --git a/manjaro/gnome/profile.conf b/manjaro/gnome/profile.conf
index da398e9..ed9cef3 100644
--- a/manjaro/gnome/profile.conf
+++ b/manjaro/gnome/profile.conf
@@ -21,7 +21,7 @@ displaymanager="gdm"
 # nonfree_mhwd="false"
 
 # possible values: grub;systemd-boot
-# efi_boot_loader="grub"
+efi_boot_loader="systemd-boot"
 
 # configure calamares for netinstall
 # netinstall="false"
diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop
index 273b627..97c8804 100644
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@@ -290,3 +290,13 @@ manjaro-hotfixes
 ## Flatpak support
 >extra xdg-desktop-portal
 >extra xdg-desktop-portal-kde
+
+# mbp
+linux56-mbp-headers
+linux56-mbp-docs
+linux56-mbp-zfs
+linux56-mbp-bbswitch
+linux56-mbp-broadcom-wl
+linux56-mbp-virtualbox-guest-modules
+linux56-mbp-virtualbox-host-modules
+apple-bce-dkms-git
diff --git a/manjaro/kde/profile.conf b/manjaro/kde/profile.conf
index 877412f..dcd33d1 100644
--- a/manjaro/kde/profile.conf
+++ b/manjaro/kde/profile.conf
@@ -20,7 +20,7 @@ displaymanager="sddm"
 ################ install ################
 
 # unset defaults to given value
-# efi_boot_loader="grub"
+efi_boot_loader="systemd-boot"
 
 # configure calamares for netinstall
 # netinstall="false"
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index 6d3b43c..d20243b 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -247,3 +247,13 @@ xiccd # enable color profile settings
 #hsd-git
 #veracrypt
 #cryptoseed
+
+# mbp
+linux56-mbp-headers
+linux56-mbp-docs
+linux56-mbp-zfs
+linux56-mbp-bbswitch
+linux56-mbp-broadcom-wl
+linux56-mbp-virtualbox-guest-modules
+linux56-mbp-virtualbox-host-modules
+apple-bce-dkms-git
diff --git a/manjaro/xfce/profile.conf b/manjaro/xfce/profile.conf
index 9ccb3b9..58b323c 100644
--- a/manjaro/xfce/profile.conf
+++ b/manjaro/xfce/profile.conf
@@ -19,7 +19,7 @@ displaymanager="lightdm"
 ################ install ################
 
 # unset defaults to given value
-# efi_boot_loader="grub"
+efi_boot_loader="systemd-boot"
 
 # configure calamares for netinstall
 # netinstall="false"
diff --git a/manjaro/xfce/user-repos.conf b/manjaro/xfce/user-repos.conf
new file mode 100644
index 0000000..d3e28ed
--- /dev/null
+++ b/manjaro/xfce/user-repos.conf
@@ -0,0 +1,3 @@
+[mbp]
+SigLevel = Optional TrustAll
+Server = http://jacobpyke.xyz:8080/archlinux/$repo/$arch
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index 29bdf93..f1f0c8a 100644
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@@ -26,21 +26,10 @@ mesa-vdpau
 >multilib lib32-primus
 #>nonfree_default catalyst-utils
 #>nonfree_default KERNEL-catalyst
-#>nonfree_default KERNEL-nvidia-340xx
->nonfree_default KERNEL-nvidia-390xx
->nonfree_x86_64 KERNEL-nvidia-440xx
->nonfree_default nvidia-340xx-utils
->nonfree_default nvidia-390xx-utils
->nonfree_x86_64 nvidia-440xx-utils
-#>nonfree_multilib lib32-catalyst-utils
->nonfree_multilib lib32-nvidia-440xx-utils
-#>nonfree_multilib lib32-nvidia-340xx-utils
->nonfree_multilib lib32-nvidia-390xx-utils
 opencl-mesa
 open-vm-tools
 primus
 bumblebee
-nvidia-prime
 gtkmm3
 spice-vdagent
 virtualbox-guest-utils