Added search element and theme variables