Fixed the default module preference. Reorganized a couple of methods, and began implementation of themes.