Few more sub-theme fixes