added new content, cleaned up theme code