Updated theme and module

Made changes in the module and pulling them into profile. See theme and
module project for more details