Various updates to better support admin themes.