Restructure Theme classes and refine basic theme appearance