theme functions added fix 5