Rewrote Theme code and functions. Needs clean up pass...