theme functions added fix 6