Made it so theming now works via plugin architecture so it is more of a solidified system for use.