Advanced theme prj

theme fixes based on pull request feedback