work on supporting different themes