Fixing up theme stuff