Revert bookmarks refactor (causes more issues than it fixes),

This reverts commit 6c890a95222228d3773fb6efe1f98f31f1102540.
Fix original unmount crash a different way
Show custom colors and emblems in places sidebar
bookmarks:  Use singleton for bookmark-list, track visited (for icon
updates), distinguish 'opened' network bookmarks from available.