merging fixed theme code from topic branch