Update Feature: Moved theme class as a part of non transparent extension