Fixing more theme problems.