modify a little on theme, and config