Class Enhancement

Add classes to theme management. One base class for all themes.