Per #381 - added context module, theme changes, rebuilt view