Small changes in Themes

Small JS Changes