Fixing theme problem