theme functions added fix 1