I only really thought of repackaging Firefox to avoid their new ToS, a tiny set of patches should be very maintainable.