Fixing themes (continued)