Modified themes further. Ready for post