Reworking base theme