theme functions added fix 2