Fix themes
Fix base theme