Fixing theme for new hierarchy