Fixing some theme-related things