Added wrapper template & theme functions