Fix themes, consolidate