Theme1 changes and fixes committed