theme functions added fix 4