Continue working on theme and generating html