Added options to prefs diffusion: rebels, initial diff, shadow prefs, ring geom