adding modules and some theming