Miscellaneous theme fixes