Revert "unified source"

This reverts commit 6f3e7199ede2032765f0bd911be3f75830f98281.
so far so good
prefs integrated