updated for theme and module