Just use ClassicWB 3.9 which is what ClassicWB 3.1 version have minus Scalos which imho is really nice for the original 3.9 feel but with the extra nice features and awesome customization of DOpus that CWB has.
Stick with BB1+BB2 unless you want to use newer versions of modules.