updating custom subtheme, consolidating custom features into single module