more cleanups to markup and base theme