Revert "fix conflicts"

This reverts commit f181360dd338dc2d926d3eeb66a6293b37f6143d.
Revert "Add wallpaper pickers to seperate package [1/2]"

This reverts commit f08adef1d5c01769bff207e27072d1e0b470e8ee.