Add more changes for new theme
Removed commented out code